summary refs log tree commit diff
path: root/tests/rest/test_rooms.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 19:49:42 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 19:49:42 +0100
commitd2798de660c84dea775f3c79ff8200baf084d244 (patch)
tree11501e9446fe13244e2e5e71d0747f32a124e1e1 /tests/rest/test_rooms.py
parentUse store.persist_event rather than pdu_actions.persist_outgoing/pdu_actions.... (diff)
downloadsynapse-d2798de660c84dea775f3c79ff8200baf084d244.tar.xz
Fold federation/handler into handlers/federation
Diffstat (limited to 'tests/rest/test_rooms.py')
-rw-r--r--tests/rest/test_rooms.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/rest/test_rooms.py b/tests/rest/test_rooms.py
index 8514d6ba21..83e5d0c129 100644
--- a/tests/rest/test_rooms.py
+++ b/tests/rest/test_rooms.py
@@ -54,12 +54,12 @@ class RoomPermissionsTestCase(RestTestCase):
             "test",
             db_pool=None,
             http_client=None,
-            federation=Mock(),
             datastore=MemoryDataStore(),
             replication_layer=Mock(),
             state_handler=state_handler,
             persistence_service=persistence_service,
         )
+        hs.get_handlers().federation_handler = Mock()
 
         def _get_user_by_token(token=None):
             return hs.parse_userid(self.auth_user_id)
@@ -403,12 +403,12 @@ class RoomsMemberListTestCase(RestTestCase):
             "test",
             db_pool=None,
             http_client=None,
-            federation=Mock(),
             datastore=MemoryDataStore(),
             replication_layer=Mock(),
             state_handler=state_handler,
             persistence_service=persistence_service,
         )
+        hs.get_handlers().federation_handler = Mock()
 
         self.auth_user_id = self.user_id
 
@@ -484,12 +484,12 @@ class RoomsCreateTestCase(RestTestCase):
             "test",
             db_pool=None,
             http_client=None,
-            federation=Mock(),
             datastore=MemoryDataStore(),
             replication_layer=Mock(),
             state_handler=state_handler,
             persistence_service=persistence_service,
         )
+        hs.get_handlers().federation_handler = Mock()
 
         def _get_user_by_token(token=None):
             return hs.parse_userid(self.auth_user_id)
@@ -626,12 +626,12 @@ class RoomTopicTestCase(RestTestCase):
             "test",
             db_pool=None,
             http_client=None,
-            federation=Mock(),
             datastore=MemoryDataStore(),
             replication_layer=Mock(),
             state_handler=state_handler,
             persistence_service=persistence_service,
         )
+        hs.get_handlers().federation_handler = Mock()
 
         def _get_user_by_token(token=None):
             return hs.parse_userid(self.auth_user_id)
@@ -729,12 +729,12 @@ class RoomMemberStateTestCase(RestTestCase):
             "test",
             db_pool=None,
             http_client=None,
-            federation=Mock(),
             datastore=MemoryDataStore(),
             replication_layer=Mock(),
             state_handler=state_handler,
             persistence_service=persistence_service,
         )
+        hs.get_handlers().federation_handler = Mock()
 
         def _get_user_by_token(token=None):
             return hs.parse_userid(self.auth_user_id)
@@ -855,12 +855,12 @@ class RoomMessagesTestCase(RestTestCase):
             "test",
             db_pool=None,
             http_client=None,
-            federation=Mock(),
             datastore=MemoryDataStore(),
             replication_layer=Mock(),
             state_handler=state_handler,
             persistence_service=persistence_service,
         )
+        hs.get_handlers().federation_handler = Mock()
 
         def _get_user_by_token(token=None):
             return hs.parse_userid(self.auth_user_id)