From: Colin Vidal <colin@isc.org>
Date: Wed, 13 May 2026 13:20:35 +0000 (+0200)
Subject: Fix cyclic glues (again)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5655fa9183b8bf854f550c58f71bd3108c9020ad;p=thirdparty%2Fbind9.git

Fix cyclic glues (again)

Previous fix `ed90d578b3a98f45eb8bc09966e9c4ab870a156d` uses
`wait_for_line()` by mistake as the test aims to wait for two log lines
to be printed before continuing (and not continuing as soon as one of
them is printed).

Instead, `wait_for_all()` is used since the order between the two
expected log line is not guaranteed.
---

diff --git a/bin/tests/system/cyclic_glue/tests_cyclic_glue.py b/bin/tests/system/cyclic_glue/tests_cyclic_glue.py
index 6957e845301..0aec3ad1776 100644
--- a/bin/tests/system/cyclic_glue/tests_cyclic_glue.py
+++ b/bin/tests/system/cyclic_glue/tests_cyclic_glue.py
@@ -50,7 +50,7 @@ def test_cyclic_glues(ns1, ns4, templates):
     templates.render("ns1/root.db", {"broken_ns": True})
     with ns1.watch_log_from_here() as watcher:
         ns1.rndc("reload")
-        watcher.wait_for_line(["running", "zone ./IN: loaded serial"])
+        watcher.wait_for_all(["running", "zone ./IN: loaded serial"])
 
     with ns4.watch_log_from_here() as watcher:
         ns4.rndc("flush")