From: Michał Kępień <michal@isc.org>
Date: Thu, 21 Dec 2023 11:22:18 +0000 (+0100)
Subject: Refactor string matching loop for readability
X-Git-Tag: v9.19.21~18^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=831c5d34f96441fa9aa258feab26e452333cc3ff;p=thirdparty%2Fbind9.git

Refactor string matching loop for readability
---

diff --git a/bin/tests/system/checkds/tests_checkds.py b/bin/tests/system/checkds/tests_checkds.py
index 86b430e5d46..b411282d361 100755
--- a/bin/tests/system/checkds/tests_checkds.py
+++ b/bin/tests/system/checkds/tests_checkds.py
@@ -489,20 +489,16 @@ def test_checkds(servers, params):
     # Wait until the provided zone is signed and then verify its DNSSEC data.
     zone_check(servers["ns9"], params.zone)
 
-    # Wait until all the expected log lines are found in the log file for the
-    # provided server.
+    # Wait up to 10 seconds until all the expected log lines are found in the
+    # log file for the provided server.  Rekey every second if necessary.
+    time_remaining = 10
     for log_string in params.logs_to_wait_for:
-        for _ in range(10):
-            with servers["ns9"].watch_log_from_start() as watcher:
-                line = f"zone {params.zone}/IN (signed): checkds: {log_string}"
-                try:
-                    watcher.wait_for_line(line, timeout=1)
-                except TimeoutError:
-                    rekey(params.zone)
-                else:
-                    break
-        else:
-            raise TimeoutError
+        line = f"zone {params.zone}/IN (signed): checkds: {log_string}"
+        while line not in servers["ns9"].log:
+            rekey(params.zone)
+            time_remaining -= 1
+            assert time_remaining, f'Timed out waiting for "{log_string}" to be logged'
+            time.sleep(1)
 
     # Check whether key states on the parent server provided match
     # expectations.