summary refs log tree commit diff
path: root/tests/test_dns.py
diff options
context:
space:
mode:
authorSilke <silke@slxh.eu>2018-03-20 10:40:16 +0100
committerSilke Hofstra <silke@slxh.eu>2018-04-04 12:26:50 +0200
commit72251d1b979db0bc96e5d95ac70b8e1cd78cde7c (patch)
tree72b31f01ce6c1f2c48c36fab32793e479a6e27fc /tests/test_dns.py
parentMerge pull request #3000 from NotAFile/change-except-style (diff)
downloadsynapse-72251d1b979db0bc96e5d95ac70b8e1cd78cde7c.tar.xz
Remove address resolution of hosts in SRV records
Signed-off-by: Silke Hofstra <silke@slxh.eu>
Diffstat (limited to 'tests/test_dns.py')
-rw-r--r--tests/test_dns.py29
1 files changed, 2 insertions, 27 deletions
diff --git a/tests/test_dns.py b/tests/test_dns.py

index d08b0f4333..af607d626f 100644 --- a/tests/test_dns.py +++ b/tests/test_dns.py
@@ -33,8 +33,6 @@ class DnsTestCase(unittest.TestCase): service_name = "test_service.example.com" host_name = "example.com" - ip_address = "127.0.0.1" - ip6_address = "::1" answer_srv = dns.RRHeader( type=dns.SRV, @@ -43,29 +41,9 @@ class DnsTestCase(unittest.TestCase): ) ) - answer_a = dns.RRHeader( - type=dns.A, - payload=dns.Record_A( - address=ip_address, - ) - ) - - answer_aaaa = dns.RRHeader( - type=dns.AAAA, - payload=dns.Record_AAAA( - address=ip6_address, - ) - ) - dns_client_mock.lookupService.return_value = defer.succeed( ([answer_srv], None, None), ) - dns_client_mock.lookupAddress.return_value = defer.succeed( - ([answer_a], None, None), - ) - dns_client_mock.lookupIPV6Address.return_value = defer.succeed( - ([answer_aaaa], None, None), - ) cache = {} @@ -74,13 +52,10 @@ class DnsTestCase(unittest.TestCase): ) dns_client_mock.lookupService.assert_called_once_with(service_name) - dns_client_mock.lookupAddress.assert_called_once_with(host_name) - dns_client_mock.lookupIPV6Address.assert_called_once_with(host_name) - self.assertEquals(len(servers), 2) + self.assertEquals(len(servers), 1) self.assertEquals(servers, cache[service_name]) - self.assertEquals(servers[0].host, ip_address) - self.assertEquals(servers[1].host, ip6_address) + self.assertEquals(servers[0].host, host_name) @defer.inlineCallbacks def test_from_cache_expired_and_dns_fail(self):