From f76fa8ad35efd4585dcbd5a2f8878bd6ed9828d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Thu, 29 Jan 2026 11:37:43 +0100 Subject: [PATCH] Improve logging for isctest.run.retry_with_timeout Add more debug messages around the retry function to facilitate debugging in case of issues. (cherry picked from commit d237048de2493cc3f801017c44ea53eaf39cd140) --- bin/tests/system/isctest/run.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/isctest/run.py b/bin/tests/system/isctest/run.py index 9b6ef31236..65fd5ec8df 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