summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-03 14:26:35 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-03 14:26:52 +0100
commit7fc84c7019801f74514cfaeadc2e86508ff55ba3 (patch)
tree3f4cb6ea17bf5289d7eb1ed7d692dd274a4f9d95 /tests
parentSend unrecognized commands as text message (as before) (diff)
downloadsynapse-7fc84c7019801f74514cfaeadc2e86508ff55ba3.tar.xz
Make retrying requests on DNS failures configurable, and turn off retrying only in directory.get_association
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_directory.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py

index 88ac8933f8..e509c1b629 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py
@@ -21,6 +21,7 @@ from mock import Mock import logging from synapse.server import HomeServer +from synapse.http.client import HttpClient from synapse.handlers.directory import DirectoryHandler from synapse.storage.directory import RoomAliasMapping @@ -92,7 +93,10 @@ class DirectoryTestCase(unittest.TestCase): self.mock_federation.make_query.assert_called_with( destination="remote", query_type="directory", - args={"room_alias": "#another:remote"} + args={ + "room_alias": "#another:remote", + HttpClient.RETRY_DNS_LOOKUP_FAILURES: False + } ) @defer.inlineCallbacks