summary refs log tree commit diff
path: root/tests/federation/test_federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-17 18:46:04 +0000
committerErik Johnston <erik@matrix.org>2015-11-17 18:46:04 +0000
commitb697a842a5d25fccf890bedeebdb85eed80fa732 (patch)
tree5161c402239d23d7cfd5813982e0df09d523a4a7 /tests/federation/test_federation.py
parentMerge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop (diff)
parentUpdate tests (diff)
downloadsynapse-b697a842a5d25fccf890bedeebdb85eed80fa732.tar.xz
Merge pull request #384 from matrix-org/erikj/shorter_retries
Only retry federation requests for a long time for background requests
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 a4ef60b911..96570f9072 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py
@@ -197,6 +197,7 @@ class FederationTestCase(unittest.TestCase): 'pdu_failures': [], }, json_data_callback=ANY, + long_retries=True, ) @defer.inlineCallbacks @@ -228,6 +229,7 @@ class FederationTestCase(unittest.TestCase): 'pdu_failures': [], }, json_data_callback=ANY, + long_retries=True, ) @defer.inlineCallbacks