summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 17:21:38 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 17:21:48 +0100
commite111a06e0a677fb3c8a7d7259a152fe2c6267975 (patch)
treec22865ec522e63a308c61d354187651ffb02fdea
parentIf timeout=0, return immediately (diff)
downloadsynapse-e111a06e0a677fb3c8a7d7259a152fe2c6267975.tar.xz
Fix tests.
-rw-r--r--tests/handlers/test_federation.py3
-rw-r--r--tests/handlers/test_room.py4
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index a92d825f49..7f7e2b63a0 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -74,8 +74,7 @@ class FederationTestCase(unittest.TestCase):
         yield self.handlers.federation_handler.on_receive(event, False, False)
 
         self.datastore.persist_event.assert_called_once_with(event, False)
-        self.notifier.on_new_room_event.assert_called_once_with(
-                event, store_id)
+        self.notifier.on_new_room_event.assert_called_once_with(event)
 
     @defer.inlineCallbacks
     def test_invite_join_target_this(self):
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index fddab8f74f..04d88cb199 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -116,7 +116,7 @@ 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)
@@ -175,7 +175,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)