summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-05 14:03:00 +0000
committerErik Johnston <erik@matrix.org>2015-02-05 14:03:00 +0000
commitf08bd958802679de89e29bc60da7ecf29e130ca2 (patch)
tree1b3c14cae9b04223805dccd0d730910f4cd80b64 /tests
parentSYN-202: Log as WARN the 404 'Presence information not visible' errors instea... (diff)
parentChange context.auth_events to what the auth_events would be bases on context.... (diff)
downloadsynapse-f08bd958802679de89e29bc60da7ecf29e130ca2.tar.xz
Merge pull request #47 from matrix-org/signature_failures
Federation fixes.
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_federation.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 44dbce6bea..4270481139 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -91,7 +91,10 @@ 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 have_events(event_ids):
+            return defer.succeed({})
+        self.datastore.have_events.side_effect = have_events
 
         def annotate(ev, old_state=None):
             context = Mock()