diff options
| author | Luca Boccassi <bluca@debian.org> | 2022-03-21 20:05:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-21 20:05:06 +0000 |
| commit | a557e619933cd3e74ceddfa022e4320f43b7a72a (patch) | |
| tree | 8d65a3c8a7c2f8b1db783cf43106a18e7d363bad | |
| parent | f5d0f21c3721d8788e96add470630cd1cd91c34c (diff) | |
| parent | 1b87ca4fe9e36c841a16883883b34b1472bec4af (diff) | |
| download | systemd-a557e619933cd3e74ceddfa022e4320f43b7a72a.tar.gz | |
Merge pull request #22804 from mrc0mmand/test-tweaks
A couple of TEST-69 tweaks
| -rwxr-xr-x | test/TEST-69-SHUTDOWN/test.sh | 17 | ||||
| -rw-r--r-- | test/units/testsuite-69.service | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/test/TEST-69-SHUTDOWN/test.sh b/test/TEST-69-SHUTDOWN/test.sh index dd7b8998b5..c7f78fe3c9 100755 --- a/test/TEST-69-SHUTDOWN/test.sh +++ b/test/TEST-69-SHUTDOWN/test.sh @@ -13,18 +13,23 @@ _ORIG_NSPAWN="${SYSTEMD_NSPAWN:?}" SYSTEMD_NSPAWN="${STATEDIR:?}/run-nspawn" setup_nspawn_root_hook() { - cat > "${STATEDIR:?}"/run-nspawn <<-EOF - #!/bin/bash - exec "${TEST_BASE_DIR:?}"/test-shutdown.py -- "$_ORIG_NSPAWN" "\$@" - exit 1 - EOF + cat >"${STATEDIR:?}/run-nspawn" <<EOF +#!/bin/bash +exec "${TEST_BASE_DIR:?}/test-shutdown.py" -v -- "$_ORIG_NSPAWN" "\$@" +exit 1 +EOF chmod 755 "${STATEDIR:?}"/run-nspawn } test_append_files() { local workspace="${1:?}" # prevent shutdown in test suite, the expect script does that manually. - rm "${workspace:?}/usr/lib/systemd/tests/testdata/units/end.service" + 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/units/testsuite-69.service b/test/units/testsuite-69.service index 3b2b81edc8..7aa0664b85 100644 --- a/test/units/testsuite-69.service +++ b/test/units/testsuite-69.service @@ -4,4 +4,4 @@ Description=TEST-69-SHUTDOWN [Service] Type=oneshot -ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +ExecStart=/bin/true |