]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix cyclic glues (again) 12013/head
authorColin Vidal <colin@isc.org>
Wed, 13 May 2026 13:20:35 +0000 (15:20 +0200)
committerColin Vidal <colin@isc.org>
Wed, 13 May 2026 20:27:05 +0000 (22:27 +0200)
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.

bin/tests/system/cyclic_glue/tests_cyclic_glue.py

index 6957e845301c8ca98a13dad5e1a4d3dbc0b56098..0aec3ad177648b487f781bdd5b015f2139d7eb06 100644 (file)
@@ -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")