Move root zone mirror system test to a separate directory

This test doesn't require artifact checking but when bundled in the same
directory with the shell based tests, the `system:clang:tsan` job was
failing non-deterministically.

diff --git a/bin/tests/system/mirror/ns4/named.conf.j2 b/bin/tests/system/mirror-root-zone/ns1/named.conf.j2
similarity index 85%
rename from bin/tests/system/mirror/ns4/named.conf.j2
rename to bin/tests/system/mirror-root-zone/ns1/named.conf.j2
index 4d83d120f1fdd488c72d75cf6ea081be6b644b89..21c4035fc4e825b38e86ce59cfc869505177945c 100644 (file)
--- a/bin/tests/system/mirror/ns4/named.conf.j2
+++ b/bin/tests/system/mirror-root-zone/ns1/named.conf.j2
@@ -17,12 +17,12 @@ key rndc_key {
 };
 
 controls {
-       inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+       inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 options {
        pid-file "named.pid";
-       listen-on port @PORT@ {10.53.0.4;};
+       listen-on port @PORT@ {10.53.0.1;};
 };
 
 zone "." { type mirror; };

diff --git a/bin/tests/system/mirror/tests_mirror.py b/bin/tests/system/mirror-root-zone/tests_mirror_root_zone.py
similarity index 92%
rename from bin/tests/system/mirror/tests_mirror.py
rename to bin/tests/system/mirror-root-zone/tests_mirror_root_zone.py
index 98bbdc91942c338add16d67c5f246ec8096c1e50..31fdf8dd50af8788aa7230849c2ab71c21419d59 100644 (file)
--- a/bin/tests/system/mirror/tests_mirror.py
+++ b/bin/tests/system/mirror-root-zone/tests_mirror_root_zone.py
@@ -21,7 +21,7 @@ def test_mirror_root_zone(servers: Dict[str, NamedInstance]):
     This test pulls the root zone from the Internet, so let's only run
     it when CI_ENABLE_LIVE_INTERNET_TESTS is set.
     """
-    ns4 = servers["ns4"]
-    with ns4.watch_log_from_start() as watch_log:
+    ns1 = servers["ns1"]
+    with ns1.watch_log_from_start() as watch_log:
         # TimeoutError is raised if the line is not found and the test will fail.
         watch_log.wait_for_line("Transfer status: success")