diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index ab9c242579..f4cf54b7ee 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright 2014 matrix.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,6 +40,7 @@ class FederationTestCase(unittest.TestCase):
datastore=NonCallableMock(spec_set=[
"persist_event",
"store_room",
+ "get_room",
]),
resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]),
@@ -69,10 +69,11 @@ class FederationTestCase(unittest.TestCase):
store_id = "ASD"
self.datastore.persist_event.return_value = defer.succeed(store_id)
+ self.datastore.get_room.return_value = defer.succeed(True)
- yield self.handlers.federation_handler.on_receive(event, False)
+ yield self.handlers.federation_handler.on_receive(event, False, False)
- self.datastore.persist_event.assert_called_once_with(event)
+ self.datastore.persist_event.assert_called_once_with(event, False)
self.notifier.on_new_room_event.assert_called_once_with(
event, store_id)
@@ -89,7 +90,7 @@ class FederationTestCase(unittest.TestCase):
content={},
)
- yield self.handlers.federation_handler.on_receive(event, False)
+ yield self.handlers.federation_handler.on_receive(event, False, False)
mem_handler = self.handlers.room_member_handler
self.assertEquals(1, mem_handler.change_membership.call_count)
@@ -115,7 +116,7 @@ class FederationTestCase(unittest.TestCase):
content={},
)
- yield self.handlers.federation_handler.on_receive(event, False)
+ yield self.handlers.federation_handler.on_receive(event, False, False)
mem_handler = self.handlers.room_member_handler
self.assertEquals(0, mem_handler.change_membership.call_count)
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index fd2d66db38..bf71d3be3b 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -40,7 +40,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
self.hostname,
db_pool=None,
datastore=NonCallableMock(spec_set=[
- "store_room_member",
+ "persist_event",
"get_joined_hosts_for_room",
"get_room_member",
"get_room",
@@ -69,6 +69,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
self.distributor = hs.get_distributor()
self.hs = hs
+ 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
@@ -97,7 +99,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
)
store_id = "store_id_fooo"
- self.datastore.store_room_member.return_value = defer.succeed(store_id)
+ self.datastore.persist_event.return_value = defer.succeed(store_id)
# Actual invocation
yield self.room_member_handler.change_membership(event)
@@ -110,12 +112,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
set(event.destinations)
)
- self.datastore.store_room_member.assert_called_once_with(
- user_id=target_user_id,
- sender=user_id,
- room_id=room_id,
- content=content,
- membership=Membership.INVITE,
+ self.datastore.persist_event.assert_called_once_with(
+ event
)
self.notifier.on_new_room_event.assert_called_once_with(
event, store_id)
@@ -144,12 +142,14 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
joined = ["red", "green"]
self.state_handler.handle_new_event.return_value = defer.succeed(True)
- self.datastore.get_joined_hosts_for_room.return_value = (
- defer.succeed(joined)
- )
+
+ def get_joined(*args):
+ return defer.succeed(joined)
+
+ self.datastore.get_joined_hosts_for_room.side_effect = get_joined
store_id = "store_id_fooo"
- self.datastore.store_room_member.return_value = defer.succeed(store_id)
+ self.datastore.persist_event.return_value = defer.succeed(store_id)
self.datastore.get_room.return_value = defer.succeed(1) # Not None.
prev_state = NonCallableMock()
@@ -171,12 +171,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
set(event.destinations)
)
- self.datastore.store_room_member.assert_called_once_with(
- user_id=target_user_id,
- sender=user_id,
- room_id=room_id,
- content=content,
- membership=Membership.JOIN,
+ self.datastore.persist_event.assert_called_once_with(
+ event
)
self.notifier.on_new_room_event.assert_called_once_with(
event, store_id)
|
