diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-29 16:50:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-29 16:52:33 +0000 |
| commit | 78015948a7febb18e000651f72f8f58830a55b93 (patch) | |
| tree | 42aac1eb30b723f21074bb814f33d8713008725a /tests/handlers/test_federation.py | |
| parent | Make post_json(...) actually send data. (diff) | |
| download | synapse-78015948a7febb18e000651f72f8f58830a55b93.tar.xz | |
Initial implementation of auth conflict resolution
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index ed21defd13..44dbce6bea 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -52,6 +52,7 @@ class FederationTestCase(unittest.TestCase): "get_room", "get_destination_retry_timings", "set_destination_retry_timings", + "have_events", ]), resource_for_federation=NonCallableMock(), http_client=NonCallableMock(spec_set=[]), @@ -90,6 +91,7 @@ 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) + self.datastore.have_events.return_value = defer.succeed({}) def annotate(ev, old_state=None): context = Mock() |