mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

[9.20] fix: nil: Move root zone mirror system test to a separate directory

Browse Source 
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.

An example of the job failing and succeeding on the same commit:
- https://gitlab.isc.org/isc-projects/bind9/-/jobs/5809299
- https://gitlab.isc.org/isc-projects/bind9/-/jobs/5809447

Backport of MR !10659

Merge branch 'backport-stepan/move-root-zone-mirror-test-to-a-separate-directory-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10662
This commit is contained in:
Štěpán Balážik
2025-06-27 16:09:06 +00:00
parent d4341c6111 96e8e72dbe
commit 709b8687b0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tests/system/mirror/ns4/named.conf.j2 → bin/tests/system/mirror-root-zone/ns1/named.conf.j2
View File

@@ -17,12 +17,12 @@ key rndc_key {
}; };
controls { 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 { options {
pid-file "named.pid"; pid-file "named.pid";
listen-on port @PORT@ {10.53.0.4;}; listen-on port @PORT@ {10.53.0.1;};
}; };
zone "." { type mirror; }; zone "." { type mirror; };

4
bin/tests/system/mirror/tests_mirror.py → bin/tests/system/mirror-root-zone/tests_mirror_root_zone.py
View File

@@ -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 This test pulls the root zone from the Internet, so let's only run
it when CI_ENABLE_LIVE_INTERNET_TESTS is set. it when CI_ENABLE_LIVE_INTERNET_TESTS is set.
""" """
ns4 = servers["ns4"] ns1 = servers["ns1"]
with ns4.watch_log_from_start() as watch_log: with ns1.watch_log_from_start() as watch_log:
# TimeoutError is raised if the line is not found and the test will fail. # TimeoutError is raised if the line is not found and the test will fail.
watch_log.wait_for_line("Transfer status: success") watch_log.wait_for_line("Transfer status: success")