Merge branch 'develop' into storage_transactions

Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py

2 files changed, 3 insertions, 5 deletions

diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 5ad40e484c..bc260c8aab 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -77,8 +77,7 @@ class FederationTestCase(unittest.TestCase):
         yield self.handlers.federation_handler.on_receive_pdu(pdu, False)
 
         self.datastore.persist_event.assert_called_once_with(ANY, False)
-        self.notifier.on_new_room_event.assert_called_once_with(
-                ANY, store_id)
+        self.notifier.on_new_room_event.assert_called_once_with(ANY)
 
     @defer.inlineCallbacks
     def test_invite_join_target_this(self):
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index a84dbcc471..09d2a92e16 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -128,9 +128,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
             event
         )
         self.notifier.on_new_room_event.assert_called_once_with(
-            event, store_id
+            event, extra_users=[self.hs.parse_userid(target_user_id)]
         )
-
         self.assertFalse(self.datastore.get_room.called)
         self.assertFalse(self.datastore.store_room.called)
         self.assertFalse(self.federation.get_state_for_room.called)
@@ -193,7 +192,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
             event
         )
         self.notifier.on_new_room_event.assert_called_once_with(
-                event, store_id)
+                event, extra_users=[user])
 
         join_signal_observer.assert_called_with(
                 user=user, room_id=room_id)