diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index 58590e4fcd..938b57bec9 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -58,7 +58,7 @@ class FederationTestCase(unittest.TestCase):
self.mock_persistence = Mock(spec=[
"get_current_state_for_context",
"get_pdu",
- "persist_pdu",
+ "persist_event",
"update_min_depth_for_context",
"prep_send_transaction",
"delivered_txn",
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index fddab8f74f..613f5c307e 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -45,6 +45,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
"get_room_member",
"get_room",
"store_room",
+ "snapshot_room",
]),
resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]),
@@ -52,29 +53,36 @@ 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)
self.handlers.profile_handler = ProfileHandler(self.hs)
self.room_member_handler = self.handlers.room_member_handler
+ self.snapshot = Mock()
+ self.datastore.snapshot_room.return_value = self.snapshot
+
+
@defer.inlineCallbacks
def test_invite(self):
room_id = "!foo:red"
@@ -104,8 +112,12 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
# Actual invocation
yield self.room_member_handler.change_membership(event)
- self.state_handler.handle_new_event.assert_called_once_with(event)
- self.federation.handle_new_event.assert_called_once_with(event)
+ self.state_handler.handle_new_event.assert_called_once_with(
+ event, self.snapshot,
+ )
+ self.federation.handle_new_event.assert_called_once_with(
+ event, self.snapshot,
+ )
self.assertEquals(
set(["blue", "red", "green"]),
@@ -116,7 +128,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
event
)
self.notifier.on_new_room_event.assert_called_once_with(
- event, store_id)
+ event, store_id
+ )
self.assertFalse(self.datastore.get_room.called)
self.assertFalse(self.datastore.store_room.called)
@@ -148,6 +161,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
self.datastore.get_joined_hosts_for_room.side_effect = get_joined
+
store_id = "store_id_fooo"
self.datastore.persist_event.return_value = defer.succeed(store_id)
self.datastore.get_room.return_value = defer.succeed(1) # Not None.
@@ -163,8 +177,12 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
# Actual invocation
yield self.room_member_handler.change_membership(event)
- self.state_handler.handle_new_event.assert_called_once_with(event)
- self.federation.handle_new_event.assert_called_once_with(event)
+ self.state_handler.handle_new_event.assert_called_once_with(
+ event, self.snapshot
+ )
+ self.federation.handle_new_event.assert_called_once_with(
+ event, self.snapshot
+ )
self.assertEquals(
set(["red", "green"]),
@@ -318,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 7bc05dc2b6..116acd5600 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 f18c506a7d..465303f166 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)
diff --git a/tests/utils.py b/tests/utils.py
index f40cbce51d..aa9608a1ed 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -127,6 +127,13 @@ class MemoryDataStore(object):
self.current_state = {}
self.events = []
+ Snapshot = namedtuple("Snapshot", "room_id user_id membership_state")
+
+ def snapshot_room(self, room_id, user_id, state_type=None, state_key=None):
+ return self.Snapshot(
+ room_id, user_id, self.get_room_member(user_id, room_id)
+ )
+
def register(self, user_id, token, password_hash):
if user_id in self.tokens_to_users.values():
raise StoreError(400, "User in use.")
|
