test: unify /testok & /failed handling

mrc0mmand · mrc0mmand · commit 07268394d6ed · 2023-07-12T16:03:40.000+02:00
And drop it where not necessary.
diff --git a/test/units/testsuite-01.sh b/test/units/testsuite-01.sh
@@ -45,4 +45,4 @@ systemctl daemon-reload
 # of systemd-analyze blame. See issue #27187.
 systemd-analyze blame
 
-echo OK >/testok
+touch /testok
diff --git a/test/units/testsuite-02.sh b/test/units/testsuite-02.sh
@@ -113,3 +113,4 @@ set -x
 journalctl --sync
 
 test ! -s /failed
+touch /testok
diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh
@@ -9,9 +9,6 @@ trap "journalctl --rotate --vacuum-size=16M" EXIT
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-07.sh b/test/units/testsuite-07.sh
@@ -6,13 +6,10 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 # Issue: https://github.com/systemd/systemd/issues/2730
 # See TEST-07-PID1/test.sh for the first "half" of the test
 mountpoint /issue2730
 
 run_subtests
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-13.sh b/test/units/testsuite-13.sh
@@ -6,9 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-16.sh b/test/units/testsuite-16.sh
@@ -117,4 +117,3 @@ if [[ -f "$TESTLOG" ]]; then
 fi
 
 touch /testok
-exit 0
diff --git a/test/units/testsuite-17.sh b/test/units/testsuite-17.sh
@@ -6,11 +6,8 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 udevadm settle
 
 run_subtests
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-19.sh b/test/units/testsuite-19.sh
@@ -3,12 +3,9 @@
 set -eux
 set -o pipefail
 
-: >/failed
-
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
 run_subtests
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-21.sh b/test/units/testsuite-21.sh
@@ -107,6 +107,4 @@ for bus in "${SESSION_BUS_LIST[@]}"; do
     systemctl --machine 'testuser@.host' --user daemon-reexec
 done
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-22.sh b/test/units/testsuite-22.sh
@@ -6,9 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-23.sh b/test/units/testsuite-23.sh
@@ -3,13 +3,10 @@
 set -eux
 set -o pipefail
 
-: >/failed
-
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
 # Note: the signal shenanigans are necessary for the Upholds= tests
 run_subtests_with_signals SIGUSR1 SIGUSR2 SIGRTMIN+1
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-24.sh b/test/units/testsuite-24.sh
@@ -213,4 +213,4 @@ cryptsetup_start_and_check -f detached_fail{0..4}
 cryptsetup_start_and_check detached_slot{0..1}
 cryptsetup_start_and_check -f detached_slot_fail
 
-echo OK >/testok
+touch /testok
diff --git a/test/units/testsuite-25.sh b/test/units/testsuite-25.sh
@@ -140,6 +140,4 @@ machinectl remove scratch5
 test ! -f /var/lib/machines/scratch5
 (! machinectl image-status scratch5)
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-26.sh b/test/units/testsuite-26.sh
@@ -7,8 +7,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-: >/failed
-
 at_exit() {
     if [[ -v UNIT_NAME && -e "/usr/lib/systemd/system/$UNIT_NAME" ]]; then
         rm -fvr "/usr/lib/systemd/system/$UNIT_NAME" "/etc/systemd/system/$UNIT_NAME.d" "+4"
@@ -463,4 +461,3 @@ systemctl enable --now test-WantedBy.service || :
 systemctl daemon-reload
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh
@@ -231,6 +231,4 @@ touch /tmp/emptyext/usr/lib/extension-release.d/extension-release.emptyext
 res="$(! portablectl attach --extension /tmp/emptyext /tmp/emptyroot 2> >(grep "Remote peer disconnected"))"
 test -z "${res}"
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-30.sh b/test/units/testsuite-30.sh
@@ -26,6 +26,4 @@ while test ! -f /tmp/clock-changed ; do sleep .5 ; done
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-31.sh b/test/units/testsuite-31.sh
@@ -7,5 +7,4 @@ if journalctl -b -t systemd --grep '\.device: Changed plugged -> dead'; then
     exit 1
 fi
 
-echo OK >/testok
-exit 0
+touch /testok
diff --git a/test/units/testsuite-32.sh b/test/units/testsuite-32.sh
@@ -33,6 +33,4 @@ if test -f /sys/fs/cgroup/system.slice/testsuite-32.service/memory.oom.group; th
     systemd-analyze log-level info
 fi
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-34.sh b/test/units/testsuite-34.sh
@@ -157,6 +157,4 @@ test_check_writable
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-35.sh b/test/units/testsuite-35.sh
@@ -653,11 +653,8 @@ EOF
     rm -f "$SCRIPT" "$PAMSERVICE"
 }
 
-: >/failed
-
 setup_test_user
 test_enable_debug
 run_testcases
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-36.sh b/test/units/testsuite-36.sh
@@ -349,6 +349,4 @@ systemctl daemon-reload
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-38.sh b/test/units/testsuite-38.sh
@@ -298,5 +298,4 @@ if [[ -e /sys/fs/cgroup/system.slice/cgroup.freeze ]]; then
     run_testcases
 fi
 
-echo OK >/testok
-exit 0
+touch /testok
diff --git a/test/units/testsuite-43.sh b/test/units/testsuite-43.sh
@@ -135,6 +135,4 @@ fi
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-44.sh b/test/units/testsuite-44.sh
@@ -15,6 +15,4 @@ grep "^hello world$" /tmp/hello-world
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-45.sh b/test/units/testsuite-45.sh
@@ -277,9 +277,6 @@ EOF
     assert_rc 3 systemctl is-active --quiet systemd-timesyncd
 }
 
-: >/failed
-
 run_testcases
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh
@@ -308,6 +308,4 @@ done
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh
@@ -551,6 +551,4 @@ echo abc > abc
 systemd-dissect --copy-to /tmp/img abc /abc
 test -f /tmp/img/abc
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-52.sh b/test/units/testsuite-52.sh
@@ -8,6 +8,4 @@ systemd-analyze log-level debug
 systemctl enable test-honor-first-shutdown.service
 systemctl start test-honor-first-shutdown.service
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-54.sh b/test/units/testsuite-54.sh
@@ -316,6 +316,4 @@ fi
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-55.sh b/test/units/testsuite-55.sh
@@ -174,6 +174,4 @@ fi
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh
@@ -1183,6 +1183,4 @@ test_sector 1024
 test_sector 2048
 test_sector 4096
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-59.sh b/test/units/testsuite-59.sh
@@ -157,6 +157,4 @@ rm /run/notify-reload-test.sh
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-60.sh b/test/units/testsuite-60.sh
@@ -241,8 +241,6 @@ EOF
     done
 }
 
-: >/failed
-
 systemd-analyze log-level debug
 systemd-analyze log-target journal
 
@@ -308,4 +306,3 @@ test_issue_23796
 systemd-analyze log-level info
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-62.sh b/test/units/testsuite-62.sh
@@ -60,6 +60,4 @@ systemctl start --wait testsuite-62-3.service
 systemctl start --wait testsuite-62-4.service
 systemctl start --wait testsuite-62-5.service
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-63.sh b/test/units/testsuite-63.sh
@@ -82,4 +82,4 @@ assert_in "test63-issue-24577-dep.service" "$output"
 
 systemctl log-level info
 
-echo OK >/testok
+touch /testok
diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
@@ -1159,8 +1159,6 @@ testcase_mdadm_lvm() {
     helper_check_device_units
 }
 
-: >/failed
-
 udevadm settle
 udevadm control --log-level debug
 lsblk -a
@@ -1187,4 +1185,3 @@ udevadm control --log-level info
 systemctl status systemd-udevd
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-65.sh b/test/units/testsuite-65.sh
@@ -845,6 +845,4 @@ systemd-analyze pcrs 14 7 0 ima
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-66.sh b/test/units/testsuite-66.sh
@@ -21,6 +21,4 @@ grep -q "thisshouldnotbehere" "$RESULTS_FILE" && exit 42
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-67.sh b/test/units/testsuite-67.sh
@@ -116,4 +116,4 @@ do
     separate_data=0
 done
 
-echo OK >/testok
+touch /testok
diff --git a/test/units/testsuite-68.sh b/test/units/testsuite-68.sh
@@ -212,6 +212,5 @@ systemctl start testservice-failure-68-template.service
 wait_on_state_or_fail "testservice-failure-exit-handler-68-template@testservice-failure-68-template.service.service" "inactive" "10"
 
 systemd-analyze log-level info
-echo OK >/testok
 
-exit 0
+touch /testok
diff --git a/test/units/testsuite-70.sh b/test/units/testsuite-70.sh
@@ -316,6 +316,4 @@ systemd-cryptenroll --tpm2-pcrs=boot-loader-code+boot-loader-config "$img"
 (! systemd-cryptenroll --wipe-slot=10240000 "$img")
 (! systemd-cryptenroll --fido2-device=auto --unlock-fido2-device=auto "$img")
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-71.sh b/test/units/testsuite-71.sh
@@ -223,9 +223,6 @@ testcase_nss-myhostname() {
     (! getent hosts -s myhostname fd00:dead:beef:cafe::1)
 }
 
-: >/failed
-
 run_testcases
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-72.sh b/test/units/testsuite-72.sh
@@ -202,6 +202,4 @@ verify_version v4 2048 4096
 rm  /var/tmp/72-joined.raw
 rm -r /var/tmp/72-{dirs,defs,source,xbootldr,esp}
 
-echo OK >/testok
-
-exit 0
+touch /testok
diff --git a/test/units/testsuite-73.sh b/test/units/testsuite-73.sh
@@ -682,8 +682,6 @@ testcase_locale_gen_leading_space() {
     localectl set-locale en_US.UTF-8
 }
 
-: >/failed
-
 # Make sure the content of kbd-model-map is the one that the tests expect
 # regardless of the version installed on the distro where the testsuite is
 # running on.
@@ -693,4 +691,3 @@ enable_debug
 run_testcases
 
 touch /testok
-rm /failed
diff --git a/test/units/testsuite-74.sh b/test/units/testsuite-74.sh
diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh
diff --git a/test/units/testsuite-78.sh b/test/units/testsuite-78.sh
diff --git a/test/units/testsuite-79.sh b/test/units/testsuite-79.sh
diff --git a/test/units/testsuite-80.sh b/test/units/testsuite-80.sh
diff --git a/test/units/testsuite-81.sh b/test/units/testsuite-81.sh
diff --git a/test/units/testsuite-82.sh b/test/units/testsuite-82.sh

Original file line number	Diff line number	Diff line change
`@@ -113,3 +113,4 @@ set -x`
`113`	`113`	`journalctl --sync`
`114`	`114`
`115`	`115`	`test ! -s /failed`
	`116`	`+touch /testok`
Original file line number	Diff line number	Diff line change
`@@ -117,4 +117,3 @@ if [[ -f "$TESTLOG" ]]; then`
`117`	`117`	`fi`
`118`	`118`
`119`	`119`	`touch /testok`
`120`		`-exit 0`
-Original file line number
+Diff line change
     systemctl --machine '[email protected]' --user daemon-reexec
 done
 -echo OK >/testok
+-
 -exit 0
 +touch /testok