diff options
author | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
commit | 449739e6a364759a86f73417626af49d6a794e3d (patch) | |
tree | 04b2f39c91ec6098ffe3b380442787ac3ce2908f /tests/handlers/test_directory.py | |
parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
parent | Check that we have auth headers and fail nicely (diff) | |
download | synapse-449739e6a364759a86f73417626af49d6a794e3d.tar.xz |
Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse
Diffstat (limited to 'tests/handlers/test_directory.py')
-rw-r--r-- | tests/handlers/test_directory.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py index dd5d85dde6..e10a49a8ac 100644 --- a/tests/handlers/test_directory.py +++ b/tests/handlers/test_directory.py @@ -20,7 +20,6 @@ from twisted.internet import defer from mock import Mock from synapse.server import HomeServer -from synapse.http.client import HttpClient from synapse.handlers.directory import DirectoryHandler from synapse.storage.directory import RoomAliasMapping @@ -95,8 +94,8 @@ class DirectoryTestCase(unittest.TestCase): query_type="directory", args={ "room_alias": "#another:remote", - HttpClient.RETRY_DNS_LOOKUP_FAILURES: False - } + }, + retry_on_dns_fail=False, ) @defer.inlineCallbacks |