From d5874d5df96259bda5c240fe785c97decdec1e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= Date: Fri, 27 Jun 2025 15:51:05 +0200 Subject: [PATCH] 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. --- .../system/{mirror/ns4 => mirror-root-zone/ns1}/named.conf.j2 | 4 ++-- .../tests_mirror_root_zone.py} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename bin/tests/system/{mirror/ns4 => mirror-root-zone/ns1}/named.conf.j2 (85%) rename bin/tests/system/{mirror/tests_mirror.py => mirror-root-zone/tests_mirror_root_zone.py} (92%) 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 4d83d120f1..21c4035fc4 100644 --- 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 98bbdc9194..31fdf8dd50 100644 --- 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")