From 5655fa9183b8bf854f550c58f71bd3108c9020ad Mon Sep 17 00:00:00 2001 From: Colin Vidal Date: Wed, 13 May 2026 15:20:35 +0200 Subject: [PATCH] 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. --- bin/tests/system/cyclic_glue/tests_cyclic_glue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tests/system/cyclic_glue/tests_cyclic_glue.py b/bin/tests/system/cyclic_glue/tests_cyclic_glue.py index 6957e84530..0aec3ad177 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")