Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-12 03:24:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix federation test

Browse Source
This commit is contained in:
Erik Johnston 2014-12-11 17:01:27 +00:00
parent c161b6cf96
commit d3eb12c7b8
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/federation.py
View File

@ -136,7 +136,7 @@ class FederationHandler(BaseHandler):
if not check_event_content_hash(event): if not check_event_content_hash(event):
logger.warn( logger.warn(
"Event content has been tampered, redacting %s, %s", "Event content has been tampered, redacting %s, %s",
event.event_id, encode_canonical_json(event.get_full_dict()) event.event_id, encode_canonical_json(event.get_dict())
) )
event = redacted_event event = redacted_event

42
tests/handlers/test_federation.py
View File

@ -20,7 +20,7 @@ from synapse.api.events.room import (
MessageEvent, MessageEvent,
) )
from synapse.api.events import SynapseEvent from synapse.events import FrozenEvent
from synapse.handlers.federation import FederationHandler from synapse.handlers.federation import FederationHandler
from synapse.server import HomeServer from synapse.server import HomeServer
@ -37,7 +37,7 @@ class FederationTestCase(unittest.TestCase):
self.mock_config.signing_key = [MockKey()] self.mock_config.signing_key = [MockKey()]
self.state_handler = NonCallableMock(spec_set=[ self.state_handler = NonCallableMock(spec_set=[
"annotate_event_with_state", "annotate_context_with_state",
]) ])
self.auth = NonCallableMock(spec_set=[ self.auth = NonCallableMock(spec_set=[
@ -78,36 +78,42 @@ class FederationTestCase(unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_msg(self): def test_msg(self):
pdu = SynapseEvent( pdu = FrozenEvent({
type=MessageEvent.TYPE, "type": MessageEvent.TYPE,
room_id="foo", "room_id": "foo",
content={"msgtype": u"fooo"}, "content": {"msgtype": u"fooo"},
origin_server_ts=0, "origin_server_ts": 0,
event_id="$a:b", "event_id": "$a:b",
user_id="@a:b", "user_id":"@a:b",
origin="b", "origin": "b",
auth_events=[], "auth_events": [],
hashes={"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"}, "hashes": {"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"},
) })
self.datastore.persist_event.return_value = defer.succeed(None) self.datastore.persist_event.return_value = defer.succeed(None)
self.datastore.get_room.return_value = defer.succeed(True) self.datastore.get_room.return_value = defer.succeed(True)
self.auth.check_host_in_room.return_value = defer.succeed(True) self.auth.check_host_in_room.return_value = defer.succeed(True)
def annotate(ev, old_state=None): def annotate(ev, context, old_state=None):
ev.old_state_events = [] context.current_state = {}
context.auth_events = {}
return defer.succeed(False) return defer.succeed(False)
self.state_handler.annotate_event_with_state.side_effect = annotate self.state_handler.annotate_context_with_state.side_effect = annotate
yield self.handlers.federation_handler.on_receive_pdu( yield self.handlers.federation_handler.on_receive_pdu(
"fo", pdu, False "fo", pdu, False
) )
self.datastore.persist_event.assert_called_once_with( self.datastore.persist_event.assert_called_once_with(
ANY, is_new_state=False, backfilled=False, current_state=None ANY,
is_new_state=True,
backfilled=False,
current_state=None,
context=ANY,
) )
self.state_handler.annotate_event_with_state.assert_called_once_with( self.state_handler.annotate_context_with_state.assert_called_once_with(
ANY,
ANY, ANY,
old_state=None, old_state=None,
) )