summary refs log tree commit diff
path: root/tests/rest/test_events.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_events.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_events.py')
-rw-r--r--tests/rest/test_events.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/rest/test_events.py b/tests/rest/test_events.py
index 4025e14581..cb641e0232 100644
--- a/tests/rest/test_events.py
+++ b/tests/rest/test_events.py
@@ -128,9 +128,9 @@ class EventStreamPermissionsTestCase(RestTestCase):
             "test",
             db_pool=None,
             http_client=None,
-            federation=Mock(),
             replication_layer=Mock(),
             state_handler=state_handler,
+            datastore=MemoryDataStore(),
             persistence_service=persistence_service,
             clock=Mock(spec=[
                 "call_later",
@@ -139,9 +139,10 @@ class EventStreamPermissionsTestCase(RestTestCase):
             ]),
         )
 
+        hs.get_handlers().federation_handler = Mock()
+
         hs.get_clock().time_msec.return_value = 1000000
 
-        hs.datastore = MemoryDataStore()
         synapse.rest.register.register_servlets(hs, self.mock_resource)
         synapse.rest.events.register_servlets(hs, self.mock_resource)
         synapse.rest.room.register_servlets(hs, self.mock_resource)