diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index 88ac8933f8..72a2b1443a 100644
--- a/tests/handlers/test_directory.py
+++ b/tests/handlers/test_directory.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Copyright 2014 matrix.org
+# Copyright 2014 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -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
@@ -49,6 +50,7 @@ class DirectoryTestCase(unittest.TestCase):
hs = HomeServer("test",
datastore=Mock(spec=[
"get_association_from_room_alias",
+ "get_joined_hosts_for_room",
]),
http_client=None,
resource_for_federation=Mock(),
@@ -60,6 +62,10 @@ class DirectoryTestCase(unittest.TestCase):
self.datastore = hs.get_datastore()
+ def hosts(room_id):
+ return defer.succeed([])
+ self.datastore.get_joined_hosts_for_room.side_effect = hosts
+
self.my_room = hs.parse_roomalias("#my-room:test")
self.remote_room = hs.parse_roomalias("#another:remote")
@@ -92,7 +98,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
|
