]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: set the default QEMU and nspawn timeouts to 30 minutes
authorFrantisek Sumsal <frantisek@sumsal.cz>
Fri, 26 Aug 2022 14:19:42 +0000 (16:19 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Fri, 26 Aug 2022 17:16:45 +0000 (19:16 +0200)
Set both timeouts to some reasonable values instead of just `infinity`
to provide some form of a safe-net in case the test goes haywire and the
environment didn't set the timeouts itself (like our CIs do).

test/test-functions

index 1c0441e7c556f1e07733b1ed3b37dbb96ac5b95f..473587fe9f7d64737b22a4eecaec818cfd534c85 100644 (file)
@@ -24,8 +24,8 @@ source "$os_release"
 [[ "$ID" = "arch" || " $ID_LIKE " = *" arch "* ]] && LOOKS_LIKE_ARCH=yes || LOOKS_LIKE_ARCH=""
 [[ " $ID_LIKE " = *" suse "* ]] && LOOKS_LIKE_SUSE=yes || LOOKS_LIKE_SUSE=""
 KERNEL_VER="${KERNEL_VER-$(uname -r)}"
-QEMU_TIMEOUT="${QEMU_TIMEOUT:-infinity}"
-NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-infinity}"
+QEMU_TIMEOUT="${QEMU_TIMEOUT:-1800}"
+NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-1800}"
 TIMED_OUT=  # will be 1 after run_* if *_TIMEOUT is set and test timed out
 [[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}"
 UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"