diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
| commit | c059c9fea5e3ef36cadc136e055284953556c4ed (patch) | |
| tree | 39faa451578ceecc16c92c390a564ebec4fc2373 /tests/handlers/test_federation.py | |
| parent | Add basic application_services SQL, and hook up parts of the appservice store... (diff) | |
| parent | Ignore empty strings for display names & room names in notifications (diff) | |
| download | synapse-c059c9fea5e3ef36cadc136e055284953556c4ed.tar.xz | |
Merge branch 'develop' into application-services
Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
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() |