test: respect the global $QEMU_TIMEOUT

CIs set QEMU and nspawn timeouts by themselves which reflect their needs
and possibilities, so let's respect that value, instead of using one
pre-set value which might or might not work for all of them.

Both Ubuntu CI and CentOS CI set these values themselves.

diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh
index 83557f22ecdfce1de08b989283fc5d386ad4466c..0564314a86c3001f3c778325148430281de9bd08 100755 (executable)
--- a/test/TEST-08-ISSUE-2730/test.sh
+++ b/test/TEST-08-ISSUE-2730/test.sh
@@ -9,7 +9,6 @@ TEST_NO_NSPAWN=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-QEMU_TIMEOUT=300
 TEST_FORCE_NEWIMAGE=1
 
 do_test "$@"

diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh
index 1c995f4801c8ae30770b1bac4abfdf5b85ace762..3fc243cc5532359b603066de81d529ac6e7e5614 100755 (executable)
--- a/test/TEST-09-ISSUE-2691/test.sh
+++ b/test/TEST-09-ISSUE-2691/test.sh
@@ -8,6 +8,4 @@ TEST_NO_NSPAWN=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-QEMU_TIMEOUT=300
-
 do_test "$@"

diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh
index 9adccc10b2e930f58138bba40a396bd3de110ce0..12dabd704d76821623ff1ddf73355ff3fe3a3e5a 100755 (executable)
--- a/test/TEST-11-ISSUE-3166/test.sh
+++ b/test/TEST-11-ISSUE-3166/test.sh
@@ -8,6 +8,4 @@ TEST_NO_NSPAWN=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-QEMU_TIMEOUT=300
-
 do_test "$@"

diff --git a/test/TEST-17-UDEV/test.sh b/test/TEST-17-UDEV/test.sh
index 9d91eee2041ca4afdd3295bf23221e39386dbc7e..6b8f08fc328a88f89ec7e2e984a79e650f499f47 100755 (executable)
--- a/test/TEST-17-UDEV/test.sh
+++ b/test/TEST-17-UDEV/test.sh
@@ -8,6 +8,5 @@ TEST_NO_NSPAWN=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-QEMU_TIMEOUT=800
 
 do_test "$@"

diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh
index a72365d0ec86edfc4d87313b3315e1f061f2ecf7..c11aab1ea9414c4c77ac857409ea37f005a0df24 100755 (executable)
--- a/test/TEST-18-FAILUREACTION/test.sh
+++ b/test/TEST-18-FAILUREACTION/test.sh
@@ -7,6 +7,4 @@ TEST_DESCRIPTION="FailureAction= operation"
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-QEMU_TIMEOUT=600
-
 do_test "$@"

diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh
index 5623708312a83355e8e888240faa28d415c18503..1b50ac3ae75765bf481531e08e471c14342275da 100755 (executable)
--- a/test/TEST-19-DELEGATE/test.sh
+++ b/test/TEST-19-DELEGATE/test.sh
@@ -8,7 +8,6 @@ TEST_NO_NSPAWN=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-QEMU_TIMEOUT=600
 UNIFIED_CGROUP_HIERARCHY=yes
 
 do_test "$@"

diff --git a/test/TEST-31-DEVICE-ENUMERATION/test.sh b/test/TEST-31-DEVICE-ENUMERATION/test.sh
index 01dd8744a77cdb68eec7e35302978897232749e8..107fa7de44a4f66422dd18b2262741b145dd4345 100755 (executable)
--- a/test/TEST-31-DEVICE-ENUMERATION/test.sh
+++ b/test/TEST-31-DEVICE-ENUMERATION/test.sh
@@ -8,6 +8,5 @@ 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 c6cd42d0a7fdc60eddfb15e34b3e10e466b798fb..0940382d5217434ba1e35923e0c4f2c02e968766 100755 (executable)
--- a/test/TEST-50-DISSECT/test.sh
+++ b/test/TEST-50-DISSECT/test.sh
@@ -12,7 +12,6 @@ TEST_INSTALL_VERITY_MINIMAL=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-QEMU_TIMEOUT=1200
 
 command -v mksquashfs >/dev/null 2>&1 || exit 0
 command -v veritysetup >/dev/null 2>&1 || exit 0

diff --git a/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh
index 80c60f19f7b0f175a9c8d59650943f04ab36387d..07b5df1d82ecb7998e29a4786bd89dc54ef1b345 100755 (executable)
--- a/test/TEST-64-UDEV-STORAGE/test.sh
+++ b/test/TEST-64-UDEV-STORAGE/test.sh
@@ -12,7 +12,6 @@ TEST_DESCRIPTION="systemd-udev storage tests"
 TEST_NO_NSPAWN=1
 # Save only journals of failing test cases by default (to conserve space)
 TEST_SAVE_JOURNAL="${TEST_SAVE_JOURNAL:-fail}"
-QEMU_TIMEOUT="${QEMU_TIMEOUT:-600}"
 
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"

diff --git a/test/TEST-67-INTEGRITY/test.sh b/test/TEST-67-INTEGRITY/test.sh
index b3bc1441abe528f9770bf05c39a027f0a00f8654..1ec2d4bf7fe3e73c5c55feb1c6b1c6f24dd388af 100755 (executable)
--- a/test/TEST-67-INTEGRITY/test.sh
+++ b/test/TEST-67-INTEGRITY/test.sh
@@ -5,7 +5,6 @@ set -e
 TEST_DESCRIPTION="dm-integrity test"
 
 TEST_NO_NSPAWN=1
-QEMU_TIMEOUT=600
 
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"