philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

nixos/test-driver: mention the elapsed time when it times out

Browse source 
For now you had to know that the actions are retried for 900s when
seeing an error like

> Traceback (most recent call last):
>   File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 927, in run_tests
>     exec(tests, globals())
>   File "<string>", line 1, in <module>
>   File "<string>", line 31, in <module>
>   File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 565, in wait_for_file
>     retry(check_file)
>   File "/nix/store/dbvmxk60sv87xsxm7kwzzjm7a4fhgy6y-nixos-test-driver/bin/.nixos-test-driver-wrapped", line 142, in retry
>     raise Exception("action timed out")
> Exception: action timed out

in your (hydra) build failure. Due to the absence of timestamps you were
left guessing if the machine was just slow, someone passed a low timeout
value (which they couldn't until now) or whatever might have happened.

By making this error a bit more descriptive (by including the elapsed
time) these hopefully become more useful.
This commit is contained in:
Andreas Rammhold 2021-05-30 17:26:13 +02:00
parent d18c416056
commit d07f52bf81
No known key found for this signature in database
GPG key ID: E432E410B5E48C86
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/lib/test-driver/test-driver.py
View file

@ -128,18 +128,18 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]
return (vlan_nr, vde_socket, vde_process, fd) return (vlan_nr, vde_socket, vde_process, fd)
def retry(fn: Callable) -> None: def retry(fn: Callable, timeout: int = 900) -> None:
"""Call the given function repeatedly, with 1 second intervals, """Call the given function repeatedly, with 1 second intervals,
until it returns True or a timeout is reached. until it returns True or a timeout is reached.
""" """
for _ in range(900): for _ in range(timeout):
if fn(False): if fn(False):
return return
time.sleep(1) time.sleep(1)
if not fn(True): if not fn(True):
raise Exception("action timed out") raise Exception(f"action timed out after {timeout} seconds")
class Logger: class Logger: