From af7fb6831fbf48f183f01b9d0b8e93773daa0c2a Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 8 Oct 2021 12:50:13 +0100 Subject: [PATCH] test: set 5 minute timeout on TEST-11-ISSUE-3166 and TEST-50-DISSECT When they work they finish quickly in under two minutes on slow machines, when soft lock ups happen in the nested virt machine each test can run for like 5 hours clogging up CI infrastructure. It's best to fail quicker than that when qemu or kernel are broken. --- test/TEST-11-ISSUE-3166/test.sh | 2 ++ test/TEST-50-DISSECT/test.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh index 15ecbe51a31..ba751853f9f 100755 --- a/test/TEST-11-ISSUE-3166/test.sh +++ b/test/TEST-11-ISSUE-3166/test.sh @@ -7,4 +7,6 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" +QEMU_TIMEOUT=300 + do_test "$@" diff --git a/test/TEST-50-DISSECT/test.sh b/test/TEST-50-DISSECT/test.sh index 1475659e6ec..d8ac512a026 100755 --- a/test/TEST-50-DISSECT/test.sh +++ b/test/TEST-50-DISSECT/test.sh @@ -11,6 +11,8 @@ TEST_INSTALL_VERITY_MINIMAL=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" +QEMU_TIMEOUT=300 + command -v mksquashfs >/dev/null 2>&1 || exit 0 command -v veritysetup >/dev/null 2>&1 || exit 0 command -v sfdisk >/dev/null 2>&1 || exit 0