summary refs log tree commit diff
path: root/tests/federation/test_federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-18 18:57:21 +0000
committerErik Johnston <erik@matrix.org>2014-12-18 18:57:21 +0000
commit41ce544abe77e34b714d4468dd895b184a12b19c (patch)
tree6d044900b3bb1fcc57e1f0868376aeed490bf7b3 /tests/federation/test_federation.py
parentTest some ideas that might help performance a bit (diff)
parentSupply auth_chain along with current state in '/state/', fetch auth events fr... (diff)
downloadsynapse-41ce544abe77e34b714d4468dd895b184a12b19c.tar.xz
Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'tests/federation/test_federation.py')
-rw-r--r--tests/federation/test_federation.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index 79ac1ce10d..3e484cd303 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -52,6 +52,7 @@ class FederationTestCase(unittest.TestCase):
             "get_received_txn_response",
             "set_received_txn_response",
             "get_destination_retry_timings",
+            "get_auth_chain",
         ])
         self.mock_persistence.get_received_txn_response.return_value = (
             defer.succeed(None)
@@ -59,6 +60,7 @@ class FederationTestCase(unittest.TestCase):
         self.mock_persistence.get_destination_retry_timings.return_value = (
             defer.succeed(DestinationsTable.EntryType("", 0, 0))
         )
+        self.mock_persistence.get_auth_chain.return_value = []
         self.mock_config = Mock()
         self.mock_config.signing_key = [MockKey()]
         self.clock = MockClock()