test: make sure to reset state before starting integration tests

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-12-13 12:34:41 +01:00
parent 8a59e79c09
commit 4962ed9f33
45 changed files with 49 additions and 0 deletions

View file

@ -1899,6 +1899,9 @@ test_setup() {
} }
test_run() { test_run() {
mount_initdir
rm -f "$initdir"/{testok,failed,skipped}
if [ -z "$TEST_NO_QEMU" ]; then if [ -z "$TEST_NO_QEMU" ]; then
if run_qemu "$1"; then if run_qemu "$1"; then
check_result_qemu || return 1 check_result_qemu || return 1

View file

@ -3,5 +3,6 @@ Description=TEST-01-BASIC
After=multi-user.target After=multi-user.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; systemctl daemon-reload ; echo OK >/testok' ExecStart=sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; systemctl daemon-reload ; echo OK >/testok'
Type=oneshot Type=oneshot

View file

@ -3,5 +3,6 @@ Description=TEST-02-CRYPTSETUP
After=multi-user.target After=multi-user.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=sh -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK > /testok' ExecStart=sh -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK > /testok'
Type=oneshot Type=oneshot

View file

@ -3,5 +3,6 @@ Description=TEST-03-JOBS
After=multi-user.target After=multi-user.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-04-JOURNAL Description=TEST-04-JOURNAL
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-05-RLIMITS Description=TEST-05-RLIMITS
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -5,5 +5,6 @@ Requires=load-systemd-test-module.service
After=load-systemd-test-module.service After=load-systemd-test-module.service
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-07-ISSUE-1981 Description=TEST-07-ISSUE-1981
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-08-ISSUE-2730 Description=TEST-08-ISSUE-2730
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK >/testok; systemctl poweroff' ExecStart=sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK >/testok; systemctl poweroff'
Type=oneshot Type=oneshot

View file

@ -2,6 +2,7 @@
Description=TEST-09-ISSUE-2691 Description=TEST-09-ISSUE-2691
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=sh -c '>/testok' ExecStart=sh -c '>/testok'
ExecStop=sh -c 'kill -SEGV $$$$' ExecStop=sh -c 'kill -SEGV $$$$'
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-10-ISSUE-2467 Description=TEST-10-ISSUE-2467
[Service] [Service]
ExecStartPre=rm -f /failed /testok
Type=oneshot Type=oneshot
ExecStart=sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test10.socket; printf x >test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok' ExecStart=sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test10.socket; printf x >test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'

View file

@ -2,5 +2,6 @@
Description=TEST-11-ISSUE-3166 Description=TEST-11-ISSUE-3166
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -3,5 +3,6 @@ Description=TEST-12-ISSUE-3171
After=multi-user.target After=multi-user.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-13-NSPAWN-SMOKE Description=TEST-13-NSPAWN-SMOKE
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,6 +2,7 @@
Description=TEST-14-MACHINE-ID Description=TEST-14-MACHINE-ID
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
ExecStart=/bin/sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK >/testok' ExecStart=/bin/sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK >/testok'
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-15-DROPIN Description=TEST-15-DROPIN
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -12,6 +12,7 @@ Wants=fail-runtime.service
StopWhenUnneeded=yes StopWhenUnneeded=yes
[Service] [Service]
ExecStartPre=rm -f /failed /testok
Type=simple Type=simple
TimeoutStartSec=infinity TimeoutStartSec=infinity
ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh

View file

@ -2,5 +2,6 @@
Description=TEST-17-UDEV-WANTS Description=TEST-17-UDEV-WANTS
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-18-FAILUREACTION Description=TEST-18-FAILUREACTION
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-19-DELEGATE Description=TEST-19-DELEGATE
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -4,6 +4,7 @@ Before=getty-pre.target
Wants=getty-pre.target Wants=getty-pre.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot
NotifyAccess=all NotifyAccess=all

View file

@ -5,6 +5,7 @@ Before=getty-pre.target
Wants=getty-pre.target Wants=getty-pre.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot
StandardOutput=tty StandardOutput=tty

View file

@ -2,5 +2,6 @@
Description=TEST-23-TYPE-EXEC Description=TEST-23-TYPE-EXEC
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-24-UNIT-TESTS Description=TEST-24-UNIT-TESTS
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -6,6 +6,9 @@ NPROC=$(nproc)
MAX_QUEUE_SIZE=${NPROC:-2} MAX_QUEUE_SIZE=${NPROC:-2}
IFS=$'\n' TEST_LIST=($(ls /usr/lib/systemd/tests/test-*)) IFS=$'\n' TEST_LIST=($(ls /usr/lib/systemd/tests/test-*))
# reset state
rm /failed-tests /skipped-tests /skipped
# Check & report test results # Check & report test results
# Arguments: # Arguments:
# $1: test path # $1: test path

View file

@ -2,5 +2,6 @@
Description=TEST-25-IMPORT Description=TEST-25-IMPORT
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-26-SETENV Description=TEST-26-SETENV
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-27-STDOUTFILE Description=TEST-27-STDOUTFILE
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -5,5 +5,6 @@ Wants=specifier-j-wants.service
After=specifier-j-wants.service After=specifier-j-wants.service
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=true ExecStart=true
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-29-UDEV-ID_RENAMING Description=TEST-29-UDEV-ID_RENAMING
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-30-ONCLOCKCHANGE Description=TEST-30-ONCLOCKCHANGE
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-31-DEVICE-ENUMERATION Description=TEST-31-DEVICE-ENUMERATION
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,6 +2,7 @@
Description=TEST-32-OOMPOLICY Description=TEST-32-OOMPOLICY
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot
MemoryAccounting=yes MemoryAccounting=yes

View file

@ -2,5 +2,6 @@
Description=TEST-33-CLEAN-UNIT Description=TEST-33-CLEAN-UNIT
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-34-DYNAMICUSERMIGRATE Description=TEST-34-DYNAMICUSERMIGRATE
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-36-NUMAPOLICY Description=TEST-36-NUMAPOLICY
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-37-RUNTIMEDIRECTORYPRESERVE Description=TEST-37-RUNTIMEDIRECTORYPRESERVE
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-39-EXECRELOAD Description=TEST-39-EXECRELOAD
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-40-EXEC-COMMAND-EX Description=TEST-40-EXEC-COMMAND-EX
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -2,5 +2,6 @@
Description=TEST-41-ONESHOT-RESTART Description=TEST-41-ONESHOT-RESTART
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -4,5 +4,6 @@ Before=getty-pre.target
Wants=getty-pre.target Wants=getty-pre.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -4,5 +4,6 @@ After=systemd-logind.service user@4711.service
Wants=user@4711.service Wants=user@4711.service
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot

View file

@ -6,6 +6,7 @@ Wants=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
After=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket After=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot
LogTarget=foobar LogTarget=foobar

View file

@ -4,6 +4,7 @@ Before=getty-pre.target
Wants=getty-pre.target Wants=getty-pre.target
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot
NotifyAccess=all NotifyAccess=all

View file

@ -2,5 +2,6 @@
Description=TEST-47-ISSUE-14566 Description=TEST-47-ISSUE-14566
[Service] [Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot Type=oneshot