Squash both rpzextra tests into tests_rpzextra.py

We don't need a separate module/file for every test. Both the rpz tests
could live in the same file.

The setup/teardown of servers if performed separately for each module --
unless there is a need to do that, it's better to avoid it.

(cherry picked from commit 1734d4a33e)

bin/tests/system/rpzextra/tests_rpz_passthru_logging.py

@@ -1,49 +0,0 @@
-#!/usr/bin/python3
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-import os
-
-import pytest
-
-pytest.importorskip("dns", minversion="2.0.0")
-import dns.resolver
-
-
-def test_rpz_passthru_logging(named_port):
-    resolver = dns.resolver.Resolver()
-    resolver.nameservers = ["10.53.0.3"]
-    resolver.port = named_port
-
-    # Should generate a log entry into rpz_passthru.txt
-    ans = resolver.resolve("allowed.", "A", source="10.53.0.1")
-    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
-    with pytest.raises(dns.resolver.NXDOMAIN):
-        resolver.resolve("baddomain.", "A", source="10.53.0.1")
-
-    rpz_passthru_logfile = os.path.join("ns3", "rpz_passthru.txt")
-    rpz_logfile = os.path.join("ns3", "rpz.txt")
-
-    assert os.path.isfile(rpz_passthru_logfile)
-    assert os.path.isfile(rpz_logfile)
-
-    with open(rpz_passthru_logfile, encoding="utf-8") as log_file:
-        line = log_file.read()
-        assert "rpz QNAME PASSTHRU rewrite allowed/A/IN" in line
-
-    with open(rpz_logfile, encoding="utf-8") as log_file:
-        line = log_file.read()
-        assert "rpz QNAME PASSTHRU rewrite allowed/A/IN" not in line
-        assert "rpz QNAME NXDOMAIN rewrite baddomain/A/IN" in line

bin/tests/system/rpzextra/tests_rpzextra.py

@@ -12,6 +12,7 @@
 # information regarding copyright ownership.
 
 import time
+import os
 
 import pytest
 
@@ -34,7 +35,8 @@ def wait_for_transfer(ip, port, client_ip, name, rrtype):
     else:
         raise RuntimeError(
             "zone transfer failed: "
-            f"client {client_ip} got NXDOMAIN for {name} {rrtype} from @{ip}:{port}")
+            f"client {client_ip} got NXDOMAIN for {name} {rrtype} from @{ip}:{port}"
+        )
 
 
 def test_rpz_multiple_views(named_port):
@@ -109,3 +111,33 @@ def test_rpz_multiple_views(named_port):
 
     with pytest.raises(dns.resolver.NXDOMAIN):
         resolver.resolve("allowed.", "A", source="10.53.0.5")
+
+
+def test_rpz_passthru_logging(named_port):
+    resolver = dns.resolver.Resolver()
+    resolver.nameservers = ["10.53.0.3"]
+    resolver.port = named_port
+
+    # Should generate a log entry into rpz_passthru.txt
+    ans = resolver.resolve("allowed.", "A", source="10.53.0.1")
+    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
+    with pytest.raises(dns.resolver.NXDOMAIN):
+        resolver.resolve("baddomain.", "A", source="10.53.0.1")
+
+    rpz_passthru_logfile = os.path.join("ns3", "rpz_passthru.txt")
+    rpz_logfile = os.path.join("ns3", "rpz.txt")
+
+    assert os.path.isfile(rpz_passthru_logfile)
+    assert os.path.isfile(rpz_logfile)
+
+    with open(rpz_passthru_logfile, encoding="utf-8") as log_file:
+        line = log_file.read()
+        assert "rpz QNAME PASSTHRU rewrite allowed/A/IN" in line
+
+    with open(rpz_logfile, encoding="utf-8") as log_file:
+        line = log_file.read()
+        assert "rpz QNAME PASSTHRU rewrite allowed/A/IN" not in line
+        assert "rpz QNAME NXDOMAIN rewrite baddomain/A/IN" in line