From: Brian Wellington <bwelling@xbill.org>
Date: Wed, 8 Jul 2020 20:14:14 +0000 (-0700)
Subject: Don't read resolv.conf in tests that don't use it.
X-Git-Tag: v2.0.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cce293110167a2e8e20fdf6cdf2d15b0b9ca6679;p=thirdparty%2Fdnspython.git

Don't read resolv.conf in tests that don't use it.
---

diff --git a/tests/test_async.py b/tests/test_async.py
index 2d387aef..2d254340 100644
--- a/tests/test_async.py
+++ b/tests/test_async.py
@@ -183,7 +183,7 @@ class AsyncTests(unittest.TestCase):
         self.assertEqual(answer[0].target, dnsgoogle)
 
     def testResolverBadScheme(self):
-        res = dns.asyncresolver.Resolver()
+        res = dns.asyncresolver.Resolver(configure=False)
         res.nameservers = ['bogus://dns.google/dns-query']
         async def run():
             answer = await res.resolve('dns.google', 'A')
diff --git a/tests/test_doh.py b/tests/test_doh.py
index f4fdae28..4c72c24b 100644
--- a/tests/test_doh.py
+++ b/tests/test_doh.py
@@ -123,7 +123,7 @@ class DNSOverHTTPSTestCase(unittest.TestCase):
         self.assertTrue(q.is_response(r))
 
     def test_resolver(self):
-        res = dns.resolver.Resolver()
+        res = dns.resolver.Resolver(configure=False)
         res.nameservers = ['https://dns.google/dns-query']
         answer = res.resolve('dns.google', 'A')
         seen = set([rdata.address for rdata in answer])
@@ -131,7 +131,7 @@ class DNSOverHTTPSTestCase(unittest.TestCase):
         self.assertTrue('8.8.4.4' in seen)
 
     def test_resolver_bad_scheme(self):
-        res = dns.resolver.Resolver()
+        res = dns.resolver.Resolver(configure=False)
         res.nameservers = ['bogus://dns.google/dns-query']
         def bad():
             answer = res.resolve('dns.google', 'A')
diff --git a/tests/test_resolver.py b/tests/test_resolver.py
index 2a9c63d7..a6ab4737 100644
--- a/tests/test_resolver.py
+++ b/tests/test_resolver.py
@@ -465,14 +465,15 @@ class LiveResolverTests(unittest.TestCase):
         self.assertRaises(dns.resolver.NXDOMAIN, bad)
 
     def testResolveCacheHit(self):
-        res = dns.resolver.Resolver()
+        res = dns.resolver.Resolver(configure=False)
+        res.nameservers = ['8.8.8.8']
         res.cache = dns.resolver.Cache()
         answer1 = res.resolve('dns.google.', 'A')
         seen = set([rdata.address for rdata in answer1])
-        self.assertTrue('8.8.8.8' in seen)
-        self.assertTrue('8.8.4.4' in seen)
+        self.assertIn('8.8.8.8', seen)
+        self.assertIn('8.8.4.4', seen)
         answer2 = res.resolve('dns.google.', 'A')
-        self.assertTrue(answer2 is answer1)
+        self.assertIs(answer2, answer1)
 
 class PollingMonkeyPatchMixin(object):
     def setUp(self):
@@ -699,7 +700,7 @@ class NanoTests(unittest.TestCase):
 
     def testE164Query(self):
         with NaptrNanoNameserver() as na:
-            res = dns.resolver.Resolver()
+            res = dns.resolver.Resolver(configure=False)
             res.port = na.udp_address[1]
             res.nameservers = [ na.udp_address[0] ]
             answer = dns.e164.query('1650551212', ['e164.arpa'], res)
diff --git a/tests/test_resolver_override.py b/tests/test_resolver_override.py
index 73484f66..acb8f871 100644
--- a/tests/test_resolver_override.py
+++ b/tests/test_resolver_override.py
@@ -21,7 +21,7 @@ except socket.gaierror:
 class OverrideSystemResolverTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.res = dns.resolver.Resolver()
+        self.res = dns.resolver.Resolver(configure=False)
         self.res.nameservers = ['8.8.8.8']
         self.res.cache = dns.resolver.LRUCache()
         dns.resolver.override_system_resolver(self.res)