diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-10-24 12:35:03 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-10-24 12:35:03 +0200 |
| commit | 5ab2f737cdd43a97a829abbd4788a72e2665422c (patch) | |
| tree | 8abea77a166de82ab8154e1fe0a5bdf5018d7854 | |
| parent | Merge pull request #29674 from poettering/unexport-marshal-blob (diff) | |
| download | systemd-5ab2f737cdd43a97a829abbd4788a72e2665422c.tar.xz systemd-5ab2f737cdd43a97a829abbd4788a72e2665422c.zip | |
test: introduce $TEST_SKIP_SHUTDOWN
To get rid of some boilerplate.
| -rwxr-xr-x | test/TEST-69-SHUTDOWN/test.sh | 12 | ||||
| -rwxr-xr-x | test/TEST-82-SOFTREBOOT/test.sh | 13 | ||||
| -rw-r--r-- | test/test-functions | 6 |
3 files changed, 9 insertions, 22 deletions
diff --git a/test/TEST-69-SHUTDOWN/test.sh b/test/TEST-69-SHUTDOWN/test.sh index c7f78fe3c9..c813b5534f 100755 --- a/test/TEST-69-SHUTDOWN/test.sh +++ b/test/TEST-69-SHUTDOWN/test.sh @@ -4,7 +4,9 @@ set -e TEST_DESCRIPTION="shutdown testing" IMAGE_NAME="shutdown" -TEST_NO_QEMU=1 +TEST_NO_QEMU=yes +# Prevent shutdown in test suite, the expect script does that manually. +TEST_SKIP_SHUTDOWN=yes # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" @@ -23,13 +25,7 @@ EOF test_append_files() { local workspace="${1:?}" - # prevent shutdown in test suite, the expect script does that manually. - mkdir -p "${workspace:?}/etc/systemd/system/end.service.d" - cat >"$workspace/etc/systemd/system/end.service.d/99-override.conf" <<EOF -[Service] -ExecStart= -ExecStart=/bin/true -EOF + inst /usr/bin/screen echo "PS1='screen\$WINDOW # '" >>"$workspace/root/.bashrc" echo 'startup_message off' >"$workspace/etc/screenrc" diff --git a/test/TEST-82-SOFTREBOOT/test.sh b/test/TEST-82-SOFTREBOOT/test.sh index 101b250842..0494149185 100755 --- a/test/TEST-82-SOFTREBOOT/test.sh +++ b/test/TEST-82-SOFTREBOOT/test.sh @@ -5,19 +5,10 @@ set -e TEST_DESCRIPTION="Test Soft-Rebooting" # We temporarily remount rootfs read-only, so ignore any missing coverage IGNORE_MISSING_COVERAGE=yes +# Prevent shutdown in test suite, the expect script does that manually. +TEST_SKIP_SHUTDOWN=yes # shellcheck source=test/test-functions . "$TEST_BASE_DIR/test-functions" -test_append_files() { - local workspace="${1:?}" - # prevent shutdown in test suite, the expect script does that manually. - mkdir -p "${workspace:?}/etc/systemd/system/end.service.d" - cat >"$workspace/etc/systemd/system/end.service.d/99-override.conf" <<EOF -[Service] -ExecStart= -ExecStart=/bin/true -EOF -} - do_test "$@" diff --git a/test/test-functions b/test/test-functions index 0c90a310a1..60db47c86a 100644 --- a/test/test-functions +++ b/test/test-functions @@ -561,13 +561,13 @@ run_qemu() { "systemd.unit=testsuite.target" "systemd.wants=testsuite-$1.service" "noresume" + "oops=panic" ${TEST_MATCH_SUBTEST:+"systemd.setenv=TEST_MATCH_SUBTEST=$TEST_MATCH_SUBTEST"} ${TEST_MATCH_TESTCASE:+"systemd.setenv=TEST_MATCH_TESTCASE=$TEST_MATCH_TESTCASE"} ) - if ! get_bool "$INTERACTIVE_DEBUG"; then + if ! get_bool "$INTERACTIVE_DEBUG" && ! get_bool "$TEST_SKIP_SHUTDOWN"; then kernel_params+=( - "oops=panic" "panic=1" "systemd.wants=end.service" ) @@ -666,7 +666,7 @@ run_nspawn() { if get_bool "$INTERACTIVE_DEBUG"; then nspawn_options+=("--console=interactive") - else + elif ! get_bool "$TEST_SKIP_SHUTDOWN"; then kernel_params+=("systemd.wants=end.service") fi |