diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 219b2c4c5e..e19b073817 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -17,16 +17,16 @@ from twisted.internet import defer
from tests import unittest
from synapse.api.events.room import (
- InviteJoinEvent, MessageEvent, RoomMemberEvent
+ MessageEvent,
)
-from synapse.api.constants import Membership
+
+from synapse.api.events import SynapseEvent
from synapse.handlers.federation import FederationHandler
from synapse.server import HomeServer
-from synapse.federation.units import Pdu
-from mock import NonCallableMock, ANY
+from mock import NonCallableMock, ANY, Mock
-from ..utils import get_mock_call_args, MockKey
+from ..utils import MockKey
class FederationTestCase(unittest.TestCase):
@@ -36,6 +36,14 @@ class FederationTestCase(unittest.TestCase):
self.mock_config = NonCallableMock()
self.mock_config.signing_key = [MockKey()]
+ self.state_handler = NonCallableMock(spec_set=[
+ "annotate_event_with_state",
+ ])
+
+ self.auth = NonCallableMock(spec_set=[
+ "check",
+ ])
+
self.hostname = "test"
hs = HomeServer(
self.hostname,
@@ -53,6 +61,9 @@ class FederationTestCase(unittest.TestCase):
"federation_handler",
]),
config=self.mock_config,
+ auth=self.auth,
+ state_handler=self.state_handler,
+ keyring=Mock(),
)
self.datastore = hs.get_datastore()
@@ -64,75 +75,37 @@ class FederationTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_msg(self):
- pdu = Pdu(
- pdu_type=MessageEvent.TYPE,
- context="foo",
+ pdu = SynapseEvent(
+ type=MessageEvent.TYPE,
+ room_id="foo",
content={"msgtype": u"fooo"},
origin_server_ts=0,
- pdu_id="a",
+ event_id="$a:b",
origin="b",
+ hashes={"sha256":"PvbCLWrTBxnBsSO7/cJ76072ySTCgI/XGadESRAe02M"},
)
- store_id = "ASD"
- self.datastore.persist_event.return_value = defer.succeed(store_id)
+ self.datastore.persist_event.return_value = defer.succeed(None)
self.datastore.get_room.return_value = defer.succeed(True)
+ self.state_handler.annotate_event_with_state.return_value = (
+ defer.succeed(False)
+ )
+
yield self.handlers.federation_handler.on_receive_pdu(pdu, False)
self.datastore.persist_event.assert_called_once_with(
ANY, False, is_new_state=False
)
- self.notifier.on_new_room_event.assert_called_once_with(ANY, extra_users=[])
-
- @defer.inlineCallbacks
- def test_invite_join_target_this(self):
- room_id = "foo"
- user_id = "@bob:red"
-
- pdu = Pdu(
- pdu_type=InviteJoinEvent.TYPE,
- user_id=user_id,
- target_host=self.hostname,
- context=room_id,
- content={},
- origin_server_ts=0,
- pdu_id="a",
- origin="b",
- )
-
- yield self.handlers.federation_handler.on_receive_pdu(pdu, False)
- mem_handler = self.handlers.room_member_handler
- self.assertEquals(1, mem_handler.change_membership.call_count)
- call_args = get_mock_call_args(
- lambda event, do_auth: None,
- mem_handler.change_membership
+ self.state_handler.annotate_event_with_state.assert_called_once_with(
+ ANY,
+ old_state=None,
)
- self.assertEquals(False, call_args["do_auth"])
- new_event = call_args["event"]
- self.assertEquals(RoomMemberEvent.TYPE, new_event.type)
- self.assertEquals(room_id, new_event.room_id)
- self.assertEquals(user_id, new_event.state_key)
- self.assertEquals(Membership.JOIN, new_event.membership)
+ self.auth.check.assert_called_once_with(ANY, raises=True)
- @defer.inlineCallbacks
- def test_invite_join_target_other(self):
- room_id = "foo"
- user_id = "@bob:red"
-
- pdu = Pdu(
- pdu_type=InviteJoinEvent.TYPE,
- user_id=user_id,
- state_key="@red:not%s" % self.hostname,
- context=room_id,
- content={},
- origin_server_ts=0,
- pdu_id="a",
- origin="b",
+ self.notifier.on_new_room_event.assert_called_once_with(
+ ANY,
+ extra_users=[]
)
-
- yield self.handlers.federation_handler.on_receive_pdu(pdu, False)
-
- mem_handler = self.handlers.room_member_handler
- self.assertEquals(0, mem_handler.change_membership.call_count)
|
