summary refs log tree commit diff
path: root/tests/handlers/test_federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-11 16:58:53 +0000
committerErik Johnston <erik@matrix.org>2014-11-11 16:58:53 +0000
commit3db2c0d43e6859e522859be271e5d361053f22b4 (patch)
tree4e7c415579b3d11b6bdc9f8a910b1ff4da7c1a3a /tests/handlers/test_federation.py
parentMerge pull request #12 from matrix-org/federation_authorization (diff)
downloadsynapse-3db2c0d43e6859e522859be271e5d361053f22b4.tar.xz
Rename annotate_state_groups to annotate_event_with_state
Diffstat (limited to 'tests/handlers/test_federation.py')
-rw-r--r--tests/handlers/test_federation.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index a9d6b2bb17..e386cddb38 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -36,7 +36,7 @@ class FederationTestCase(unittest.TestCase):
         self.mock_config.signing_key = [MockKey()]
 
         self.state_handler = NonCallableMock(spec_set=[
-            "annotate_state_groups",
+            "annotate_event_with_state",
         ])
 
         self.auth = NonCallableMock(spec_set=[
@@ -85,7 +85,7 @@ class FederationTestCase(unittest.TestCase):
         self.datastore.persist_event.return_value = defer.succeed(None)
         self.datastore.get_room.return_value = defer.succeed(True)
 
-        self.state_handler.annotate_state_groups.return_value = (
+        self.state_handler.annotate_event_with_state.return_value = (
             defer.succeed(False)
         )
 
@@ -95,7 +95,7 @@ class FederationTestCase(unittest.TestCase):
             ANY, False, is_new_state=False
         )
 
-        self.state_handler.annotate_state_groups.assert_called_once_with(
+        self.state_handler.annotate_event_with_state.assert_called_once_with(
             ANY,
             old_state=None,
         )