From: Colin Vidal <colin@isc.org>
Date: Mon, 23 Jun 2025 19:54:43 +0000 (+0200)
Subject: wait for reload completed in emptyzones system test
X-Git-Tag: v9.21.10~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=349cc060f4120848a6678105320b90edb7a4105c;p=thirdparty%2Fbind9.git

wait for reload completed in emptyzones system test

The emptyzones system test ran two consecutive "rndc reload" commands
without waiting for the first one to complete. It used to work because
the commands were serialized, but now an rndc reconfig/reload command is
ignored if another one is already running, so the emptyzones test is
more likely to fail.

Fix this problem by waiting for the log message indicating that all the
zones are loaded before attempting the next reload.
---

diff --git a/bin/tests/system/emptyzones/tests_emptyzones.py b/bin/tests/system/emptyzones/tests_emptyzones.py
index 7a8d3966bde..20911cc9bdc 100644
--- a/bin/tests/system/emptyzones/tests_emptyzones.py
+++ b/bin/tests/system/emptyzones/tests_emptyzones.py
@@ -17,7 +17,9 @@ import isctest
 def test_emptyzones(servers, templates):
     # check that switching to automatic empty zones works
     ns1 = servers["ns1"]
-    ns1.rndc("reload")
+    with ns1.watch_log_from_here() as watcher:
+        ns1.rndc("reload")
+        watcher.wait_for_line("all zones loaded")
     templates.render("ns1/named.conf", {"automatic_empty_zones": True})
     ns1.rndc("reload")
     msg = dns.message.make_query("version.bind", "TXT", "CH")