diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-10 10:35:57 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-10 10:35:57 +0000 |
commit | 6497caee7c65cffd13508eb55313a011bc8b251e (patch) | |
tree | 88448566493c7bb6bef3d07e816b2597ffb46ba5 /tests/federation/test_federation.py | |
parent | Ignore pycharm dir (diff) | |
parent | turn back on per-request transaction retries, so that every time we try to hi... (diff) | |
download | synapse-6497caee7c65cffd13508eb55313a011bc8b251e.tar.xz |
Merge pull request #22 from matrix-org/federation_retries
Federation retries
Diffstat (limited to 'tests/federation/test_federation.py')
-rw-r--r-- | tests/federation/test_federation.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index 73dd289276..f6b41e2c4c 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -25,6 +25,7 @@ from synapse.server import HomeServer from synapse.federation import initialize_http_replication from synapse.api.events import SynapseEvent +from synapse.storage.transactions import DestinationsTable def make_pdu(prev_pdus=[], **kwargs): """Provide some default fields for making a PduTuple.""" @@ -55,10 +56,14 @@ class FederationTestCase(unittest.TestCase): "delivered_txn", "get_received_txn_response", "set_received_txn_response", + "get_destination_retry_timings", ]) self.mock_persistence.get_received_txn_response.return_value = ( defer.succeed(None) ) + self.mock_persistence.get_destination_retry_timings.return_value = ( + defer.succeed(DestinationsTable.EntryType("", 0, 0)) + ) self.mock_config = Mock() self.mock_config.signing_key = [MockKey()] self.clock = MockClock() |