upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 12:13:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve logging for isctest.run.retry_with_timeout

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

(cherry picked from commit d237048de2)
This commit is contained in:
Nicki Křížek 2026-01-29 11:37:43 +01:00 committed by Nicki Křížek (GitLab job 6830046)
parent ce2d9d1618
commit f76fa8ad35
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/tests/system/isctest/run.py
View 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