]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Improve logging for isctest.run.retry_with_timeout
authorNicki Křížek <nicki@isc.org>
Thu, 29 Jan 2026 10:37:43 +0000 (11:37 +0100)
committerNicki Křížek <nicki@isc.org>
Fri, 6 Feb 2026 12:22:11 +0000 (13:22 +0100)
Add more debug messages around the retry function to facilitate
debugging in case of issues.

bin/tests/system/isctest/run.py

index 9b6ef31236b397acc186eb6b5d2017b613629440..65fd5ec8df56a8046c7c48a37f9b9941da82a4a6 100644 (file)
@@ -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