Replace dnspython resolver.query() with resolver.resolve()

The resolver.query() has been deprecated in favor of resolver.resolve();
used that.

(cherry picked from commit 3b1756d45012a66f08693c17145a8484ec68bd47)

diff --git a/bin/tests/system/dnstap/tests_dnstap.py b/bin/tests/system/dnstap/tests_dnstap.py
index 87533f4214b95258a8dc1c55f9c760e73fa99986..e27ad9d373e2126899809e81e9cda0a446c19f1f 100644 (file)
--- a/bin/tests/system/dnstap/tests_dnstap.py
+++ b/bin/tests/system/dnstap/tests_dnstap.py
@@ -41,7 +41,7 @@ def test_dnstap_dispatch_socket_addresses(named_port):
     resolver.port = named_port
 
     # Send some query to ns3 so that it records something in its dnstap file.
-    ans = resolver.query("mail.example.", "A")
+    ans = resolver.resolve("mail.example.", "A")
     assert ans[0].address == "10.0.0.2"
 
     # Before continuing, roll dnstap file to ensure it is flushed to disk.

diff --git a/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py b/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
index 326284739e654df2f9e4412843c400f5053fb448..43715e197ab60358016687e2e570f1cc1be004a7 100755 (executable)
--- a/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
+++ b/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
@@ -25,14 +25,14 @@ def test_rpz_passthru_logging(named_port):
     resolver.port = named_port
 
     # Should generate a log entry into rpz_passthru.txt
-    ans = resolver.query("allowed.", "A")
+    ans = resolver.resolve("allowed.", "A", source="10.53.0.1")
     for rd in ans:
         assert rd.address == "10.53.0.2"
 
     # baddomain.com isn't allowed (CNAME .), should return NXDOMAIN
     # Should generate a log entry into rpz.txt
     with pytest.raises(dns.resolver.NXDOMAIN):
-        resolver.query("baddomain.", "A")
+        resolver.resolve("baddomain.", "A", source="10.53.0.1")
 
     rpz_passthru_logfile = os.path.join("ns1", "rpz_passthru.txt")
     rpz_logfile = os.path.join("ns1", "rpz.txt")

diff --git a/bin/tests/system/shutdown/tests_shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
index 46c2d509b183fd08842fa435b1c470c2f1317d44..aff69c5e3ad34e3eb1de4583304b4cc96bf21205 100755 (executable)
--- a/bin/tests/system/shutdown/tests_shutdown.py
+++ b/bin/tests/system/shutdown/tests_shutdown.py
@@ -169,7 +169,7 @@ def test_named_shutdown(named_port, control_port):
             # wait for named to finish loading
             for _ in range(10):
                 try:
-                    resolver.query("version.bind", "TXT", "CH")
+                    resolver.resolve("version.bind", "TXT", "CH")
                     break
                 except (dns.resolver.NoNameservers, dns.exception.Timeout):
                     time.sleep(1)