diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index a1ab8dde68..613f5c307e 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -53,23 +53,26 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
handlers=NonCallableMock(spec_set=[
"room_member_handler",
"profile_handler",
+ "federation_handler",
]),
auth=NonCallableMock(spec_set=["check"]),
- federation=NonCallableMock(spec_set=[
- "handle_new_event",
- "get_state_for_room",
- ]),
state_handler=NonCallableMock(spec_set=["handle_new_event"]),
)
+ self.federation = NonCallableMock(spec_set=[
+ "handle_new_event",
+ "get_state_for_room",
+ ])
+
self.datastore = hs.get_datastore()
self.handlers = hs.get_handlers()
self.notifier = hs.get_notifier()
- self.federation = hs.get_federation()
self.state_handler = hs.get_state_handler()
self.distributor = hs.get_distributor()
self.hs = hs
+ self.handlers.federation_handler = self.federation
+
self.distributor.declare("collect_presencelike_data")
self.handlers.room_member_handler = RoomMemberHandler(self.hs)
@@ -333,21 +336,24 @@ class RoomCreationTest(unittest.TestCase):
handlers=NonCallableMock(spec_set=[
"room_creation_handler",
"room_member_handler",
+ "federation_handler",
]),
auth=NonCallableMock(spec_set=["check"]),
- federation=NonCallableMock(spec_set=[
- "handle_new_event",
- ]),
state_handler=NonCallableMock(spec_set=["handle_new_event"]),
)
+ self.federation = NonCallableMock(spec_set=[
+ "handle_new_event",
+ ])
+
self.datastore = hs.get_datastore()
self.handlers = hs.get_handlers()
self.notifier = hs.get_notifier()
- self.federation = hs.get_federation()
self.state_handler = hs.get_state_handler()
self.hs = hs
+ self.handlers.federation_handler = self.federation
+
self.handlers.room_creation_handler = RoomCreationHandler(self.hs)
self.room_creation_handler = self.handlers.room_creation_handler
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)
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)
|
