summary refs log tree commit diff
path: root/tests/handlers/test_federation.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-05-18 17:49:59 +0100
committerMark Haines <mjark@negativecurvature.net>2015-05-18 17:49:59 +0100
commit99914ec9f8d3f59c8a0571d8c9b21be7f56b5d31 (patch)
tree084839846d7968a0f416dc54627c07404e3b17a9 /tests/handlers/test_federation.py
parentMerge pull request #154 from matrix-org/erikj/events_move (diff)
parentDon't bother sorting by the room_stream_ids, it shouldn't matter which order ... (diff)
downloadsynapse-99914ec9f8d3f59c8a0571d8c9b21be7f56b5d31.tar.xz
Merge pull request #152 from matrix-org/notifier_performance
Notifier performance
Diffstat (limited to 'tests/handlers/test_federation.py')
-rw-r--r--tests/handlers/test_federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 08d2404b6c..f3821242bc 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -83,7 +83,7 @@ class FederationTestCase(unittest.TestCase):
             "hashes": {"sha256":"AcLrgtUIqqwaGoHhrEvYG1YLDIsVPYJdSRGhkp3jJp8"},
         })
 
-        self.datastore.persist_event.return_value = defer.succeed(None)
+        self.datastore.persist_event.return_value = defer.succeed((1,1))
         self.datastore.get_room.return_value = defer.succeed(True)
         self.auth.check_host_in_room.return_value = defer.succeed(True)
 
@@ -126,5 +126,5 @@ class FederationTestCase(unittest.TestCase):
         self.auth.check.assert_called_once_with(ANY, auth_events={})
 
         self.notifier.on_new_room_event.assert_called_once_with(
-            ANY, extra_users=[]
+            ANY, 1, 1, extra_users=[]
         )