diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-25 11:31:18 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-25 17:59:49 +0000 |
| commit | 64fc859dac122a44a753eafe015a453085e6e9a8 (patch) | |
| tree | 056658b4941cbc6a32159d4e86c455c0e6a8efe4 /tests/handlers/test_federation.py | |
| parent | Don't double url-decode state event types. (diff) | |
| download | synapse-64fc859dac122a44a753eafe015a453085e6e9a8.tar.xz | |
Fix bugs in invite/join dances.
We now do more implement more of the auth on the events so that we don't reject valid events.
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 3487a090e9..548bae7a8d 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -83,20 +83,22 @@ class FederationTestCase(unittest.TestCase): event_id="$a:b", user_id="@a:b", origin="b", + auth_events=[], hashes={"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"}, ) 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) - ) + def annotate(ev, old_state=None): + ev.old_state_events = [] + return defer.succeed(False) + self.state_handler.annotate_event_with_state.side_effect = annotate yield self.handlers.federation_handler.on_receive_pdu(pdu, False) self.datastore.persist_event.assert_called_once_with( - ANY, False, is_new_state=False + ANY, is_new_state=False, backfilled=False ) self.state_handler.annotate_event_with_state.assert_called_once_with( @@ -104,7 +106,7 @@ class FederationTestCase(unittest.TestCase): old_state=None, ) - self.auth.check.assert_called_once_with(ANY, raises=True) + self.auth.check.assert_called_once_with(ANY, auth_events={}) self.notifier.on_new_room_event.assert_called_once_with( ANY, |