From: Nicki Křížek <nicki@isc.org>
Date: Thu, 29 Jan 2026 10:37:43 +0000 (+0100)
Subject: Improve logging for isctest.run.retry_with_timeout
X-Git-Tag: v9.21.19~37^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d237048de2493cc3f801017c44ea53eaf39cd140;p=thirdparty%2Fbind9.git

Improve logging for isctest.run.retry_with_timeout

Add more debug messages around the retry function to facilitate
debugging in case of issues.
---

diff --git a/bin/tests/system/isctest/run.py b/bin/tests/system/isctest/run.py
index 9b6ef31236b..65fd5ec8df5 100644
--- a/bin/tests/system/isctest/run.py
+++ b/bin/tests/system/isctest/run.py
@@ -142,13 +142,17 @@ def perl(script: str, args: Optional[List[str]] = None) -> None:
 def retry_with_timeout(func, timeout, delay=1, msg=None):
     start_time = time.monotonic()
     exc_msg = None
+    fname = f"{func.__module__}.{func.__qualname__}()"
     while time.monotonic() < start_time + timeout:
         exc_msg = None
+        isctest.log.debug(f"retry_with_timeout: {fname} called")
         try:
             if func():
+                isctest.log.debug(f"retry_with_timeout: {fname} succeeded")
                 return
         except AssertionError as exc:
             exc_msg = str(exc)
+        isctest.log.debug(f"retry_with_timeout: {fname} failed, sleep {delay}s")
         time.sleep(delay)
     if exc_msg is not None:
         isctest.log.error(exc_msg)
@@ -156,7 +160,7 @@ def retry_with_timeout(func, timeout, delay=1, msg=None):
         if exc_msg is not None:
             msg = exc_msg
         else:
-            msg = f"{func.__module__}.{func.__qualname__} timed out after {timeout} s"
+            msg = f"{fname} timed out after {timeout} s"
     assert False, msg