summary refs log tree commit diff
path: root/tests/handlers/test_federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-03 17:20:40 +0100
committerErik Johnston <erik@matrix.org>2015-06-03 17:20:40 +0100
commit9dda396baa957f2ea2b871955e5c01c6ad0deee1 (patch)
treefd6b3bb05b0d2c54e808c9e264d0b36437e9dd23 /tests/handlers/test_federation.py
parentMerge pull request #178 from matrix-org/erikj/cache_state_groups (diff)
parentComment (diff)
downloadsynapse-9dda396baa957f2ea2b871955e5c01c6ad0deee1.tar.xz
Merge pull request #179 from matrix-org/erikj/state_group_outliers
Don't compute EventContext for outliers.
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 f3821242bc..d392c23015 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -100,7 +100,7 @@ class FederationTestCase(unittest.TestCase):
             return defer.succeed({})
         self.datastore.have_events.side_effect = have_events
 
-        def annotate(ev, old_state=None):
+        def annotate(ev, old_state=None, outlier=False):
             context = Mock()
             context.current_state = {}
             context.auth_events = {}
@@ -120,7 +120,7 @@ class FederationTestCase(unittest.TestCase):
         )
 
         self.state_handler.compute_event_context.assert_called_once_with(
-            ANY, old_state=None,
+            ANY, old_state=None, outlier=False
         )
 
         self.auth.check.assert_called_once_with(ANY, auth_events={})