diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-27 17:16:24 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-27 17:16:24 +0000 |
| commit | 5e26f6f3ae12d343bd2e1ba9b1b27fc1f7991fde (patch) | |
| tree | 288cb19c083b7bc8c7d6ca4b5eed2f8484421bbf /tests/handlers | |
| parent | Add a workaround for bug where some initial join events don't reference creat... (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-5e26f6f3ae12d343bd2e1ba9b1b27fc1f7991fde.tar.xz | |
Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse v0.5.3
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_federation.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 98cfbe50b3..33016c16ef 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -42,6 +42,7 @@ class FederationTestCase(unittest.TestCase): self.auth = NonCallableMock(spec_set=[ "check", + "check_host_in_room", ]) self.hostname = "test" @@ -89,13 +90,16 @@ class FederationTestCase(unittest.TestCase): self.datastore.persist_event.return_value = defer.succeed(None) self.datastore.get_room.return_value = defer.succeed(True) + self.auth.check_host_in_room.return_value = defer.succeed(True) 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) + yield self.handlers.federation_handler.on_receive_pdu( + "fo", pdu, False + ) self.datastore.persist_event.assert_called_once_with( ANY, is_new_state=False, backfilled=False, current_state=None |