about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Baggaley <tom@baggale.yt>2023-06-13 05:11:33 +0100
committerThomas Baggaley <tom@baggale.yt>2023-06-13 05:11:33 +0100
commit491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97 (patch)
treee8aee1a22bda8e3982778b5b488be45b17e1fc27 /nixos
parent202850e1a11a939364cef0f326cb1352b3f2d8cd (diff)
downloadnixlib-491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97.tar
nixlib-491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97.tar.gz
nixlib-491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97.tar.bz2
nixlib-491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97.tar.lz
nixlib-491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97.tar.xz
nixlib-491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97.tar.zst
nixlib-491efa0b3e7e6708d6a923ea7f7ec7c33ad12c97.zip
test-driver: respect timeout in wait_until_fails
- `wait_until_fails` was not passing through its `timeout` argument to
  the internal `retry` function, hence was always using 900 seconds (the
  default timeout for `retry`) rather than the user-specified value.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/lib/test-driver/test_driver/machine.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index 1d1d5bef9bf4..ff2cbe4109bc 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -641,7 +641,7 @@ class Machine:
             return status != 0
 
         with self.nested(f"waiting for failure: {command}"):
-            retry(check_failure)
+            retry(check_failure, timeout)
             return output
 
     def wait_for_shutdown(self) -> None: