From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 23 Mar 2023 13:41:05 +0000 (+0100)
Subject: Use more concise syntax to check responses in rpzextra tests
X-Git-Tag: v9.19.12~17^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ed26609b86b3748c1254789616fa8a4893a054e;p=thirdparty%2Fbind9.git

Use more concise syntax to check responses in rpzextra tests

All the answers are expected to have exactly one resource record. Check
it directly instead of iterating over all (possible) records.
---

diff --git a/bin/tests/system/rpzextra/tests_rpz_multiple_views.py b/bin/tests/system/rpzextra/tests_rpz_multiple_views.py
index d39eb2cf5cc..a948cbc27b5 100644
--- a/bin/tests/system/rpzextra/tests_rpz_multiple_views.py
+++ b/bin/tests/system/rpzextra/tests_rpz_multiple_views.py
@@ -15,7 +15,7 @@ import time
 
 import pytest
 
-pytest.importorskip("dns")
+pytest.importorskip("dns", minversion="2.0.0")
 import dns.resolver
 
 
@@ -53,8 +53,7 @@ def test_rpz_multiple_views(named_port):
         resolver.resolve("baddomain.", "A", source="10.53.0.1")
 
     ans = resolver.resolve("gooddomain.", "A", source="10.53.0.1")
-    for rd in ans:
-        assert rd.address == "10.53.0.2"
+    assert ans[0].address == "10.53.0.2"
 
     ans = resolver.resolve("allowed.", "A", source="10.53.0.1")
     assert ans[0].address == "10.53.0.2"
@@ -64,12 +63,10 @@ def test_rpz_multiple_views(named_port):
     # - baddomain.com is allowed
     # - gooddomain.com is allowed
     ans = resolver.resolve("baddomain.", "A", source="10.53.0.2")
-    for rd in ans:
-        assert rd.address == "10.53.0.2"
+    assert ans[0].address == "10.53.0.2"
 
     ans = resolver.resolve("gooddomain.", "A", source="10.53.0.2")
-    for rd in ans:
-        assert rd.address == "10.53.0.2"
+    assert ans[0].address == "10.53.0.2"
 
     with pytest.raises(dns.resolver.NXDOMAIN):
         resolver.resolve("allowed.", "A", source="10.53.0.2")
@@ -79,12 +76,10 @@ def test_rpz_multiple_views(named_port):
     # - baddomain.com is allowed
     # - allowed. is allowed
     ans = resolver.resolve("baddomain.", "A", source="10.53.0.3")
-    for rd in ans:
-        assert rd.address == "10.53.0.2"
+    assert ans[0].address == "10.53.0.2"
 
     ans = resolver.resolve("gooddomain.", "A", source="10.53.0.3")
-    for rd in ans:
-        assert rd.address == "10.53.0.2"
+    assert ans[0].address == "10.53.0.2"
 
     ans = resolver.resolve("allowed.", "A", source="10.53.0.3")
     assert ans[0].address == "10.53.0.2"
@@ -107,8 +102,7 @@ def test_rpz_multiple_views(named_port):
     # - gooddomain.com isn't allowed (CNAME .), should return NXDOMAIN
     # - allowed.com isn't allowed (CNAME .), should return NXDOMAIN
     ans = resolver.resolve("baddomain.", "A", source="10.53.0.5")
-    for rd in ans:
-        assert rd.address == "10.53.0.2"
+    assert ans[0].address == "10.53.0.2"
 
     with pytest.raises(dns.resolver.NXDOMAIN):
         resolver.resolve("gooddomain.", "A", source="10.53.0.5")
diff --git a/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py b/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
index 65cd3c5b104..f5776bd967b 100755
--- a/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
+++ b/bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
@@ -15,7 +15,7 @@ import os
 
 import pytest
 
-pytest.importorskip("dns")
+pytest.importorskip("dns", minversion="2.0.0")
 import dns.resolver
 
 
@@ -26,8 +26,7 @@ def test_rpz_passthru_logging(named_port):
 
     # Should generate a log entry into rpz_passthru.txt
     ans = resolver.resolve("allowed.", "A", source="10.53.0.1")
-    for rd in ans:
-        assert rd.address == "10.53.0.2"
+    assert ans[0].address == "10.53.0.2"
 
     # baddomain.com isn't allowed (CNAME .), should return NXDOMAIN
     # Should generate a log entry into rpz.txt