Merge pull request #28368 from mrc0mmand/test-fail-on-error

test: a couple of clean ups

Author: bluca

test/units/testsuite-01.sh

@@ -36,6 +36,7 @@ fi
 
 # Collect failed units & do one daemon-reload to a basic sanity check
 systemctl --state=failed --no-legend --no-pager | tee /failed
+test ! -s /failed
 systemctl daemon-reload
 
 # Check that the early setup is actually skipped on reexec.
@@ -44,4 +45,4 @@ systemctl daemon-reload
 # of systemd-analyze blame. See issue #27187.
 systemd-analyze blame
 
-echo OK >/testok
+touch /testok

test/units/testsuite-02.sh

@@ -23,7 +23,7 @@ MAX_QUEUE_SIZE=${NPROC:-2}
 mapfile -t TEST_LIST < <(find /usr/lib/systemd/tests/unit-tests/ -maxdepth 1 -type f -name "${TESTS_GLOB}")
 
 # Reset state
-rm -fv /failed-tests /skipped-tests /skipped
+rm -fv /failed /skipped /testok
 
 if ! systemd-detect-virt -qc; then
     # Make sure ping works for unprivileged users (for test-bpf-firewall)
@@ -34,7 +34,7 @@ fi
 # Arguments:
 #   $1: test path
 #   $2: test exit code
-function report_result() {
+report_result() {
     if [[ $# -ne 2 ]]; then
         echo >&2 "check_result: missing arguments"
         exit 1
@@ -112,4 +112,5 @@ set -x
 # Test logs are sometimes lost, as the system shuts down immediately after
 journalctl --sync
 
-exit 0
+test ! -s /failed
+touch /testok

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

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

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

test/units/testsuite-15.sh

@@ -6,7 +6,7 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-clear_unit () {
+clear_unit() {
     local UNIT_NAME="${1:?}"
     systemctl stop "$UNIT_NAME" 2>/dev/null || :
     rm -f  /{etc,run,usr/lib}/systemd/system/"$UNIT_NAME"
@@ -22,14 +22,14 @@ clear_unit () {
     fi
 }
 
-clear_units () {
+clear_units() {
     for u in "$@"; do
         clear_unit "$u"
     done
     systemctl daemon-reload
 }
 
-create_service () {
+create_service() {
     local SERVICE_NAME="${1:?}"
     clear_units "${SERVICE_NAME}".service
 
@@ -43,25 +43,25 @@ EOF
     mkdir -p /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME".service.{d,wants,requires}
 }
 
-create_services () {
+create_services() {
     for u in "$@"; do
         create_service "$u"
     done
 }
 
-check_ok () {
+check_ok() {
     x="$(systemctl show --value -p "${2:?}" "${1:?}")"
     case "$x" in
         *${3:?}*) return 0 ;;
         *)        return 1 ;;
     esac
 }
 
-check_ko () {
+check_ko() {
     ! check_ok "$@"
 }
 
-testcase_basic_dropins () {
+testcase_basic_dropins() {
     echo "Testing basic dropins..."
 
     echo "*** test a wants b wants c"
@@ -127,7 +127,7 @@ EOF
     clear_units test15-{a,b,c,c1}.service
 }
 
-testcase_linked_units () {
+testcase_linked_units() {
     echo "Testing linked units..."
     echo "*** test linked unit (same basename)"
 
@@ -180,7 +180,7 @@ testcase_template_alias() {
     clear_units test15-{a,b}@.service
 }
 
-testcase_hierarchical_service_dropins () {
+testcase_hierarchical_service_dropins() {
     echo "Testing hierarchical service dropins..."
     echo "*** test service.d/ top level drop-in"
     create_services a-b-c
@@ -226,7 +226,7 @@ ExecCondition=echo $dropin
     clear_units a-b-c.service
 }
 
-testcase_hierarchical_slice_dropins () {
+testcase_hierarchical_slice_dropins() {
     echo "Testing hierarchical slice dropins..."
     echo "*** test slice.d/ top level drop-in"
     # Slice units don't even need a fragment, so we test the defaults here
@@ -285,7 +285,7 @@ MemoryMax=1000000001
     clear_units a-b-c.slice
 }
 
-testcase_transient_service_dropins () {
+testcase_transient_service_dropins() {
     echo "Testing dropins for a transient service..."
     echo "*** test transient service drop-ins"
 
@@ -320,7 +320,7 @@ testcase_transient_service_dropins () {
        /etc/systemd/system/a-b-.service.d/drop3.conf
 }
 
-testcase_transient_slice_dropins () {
+testcase_transient_slice_dropins() {
     echo "Testing dropins for a transient slice..."
     echo "*** test transient slice drop-ins"
 
@@ -370,7 +370,7 @@ testcase_transient_slice_dropins () {
        /etc/systemd/system/a-b-.slice.d/drop3.conf
 }
 
-testcase_template_dropins () {
+testcase_template_dropins() {
     echo "Testing template dropins..."
 
     create_services foo bar@ yup@
@@ -519,7 +519,7 @@ EOF
     clear_units foo.service {bar,yup,bar-alias}@{,1,2,3}.service
 }
 
-testcase_alias_dropins () {
+testcase_alias_dropins() {
     echo "Testing alias dropins..."
 
     echo "*** test a wants b1 alias of b"
@@ -551,7 +551,7 @@ testcase_alias_dropins () {
     clear_units test15-{a,x,y}.service
 }
 
-testcase_masked_dropins () {
+testcase_masked_dropins() {
     echo "Testing masked dropins..."
 
     create_services test15-a test15-b
@@ -672,7 +672,7 @@ EOF
     clear_units test15-{a,b}.service
 }
 
-testcase_invalid_dropins () {
+testcase_invalid_dropins() {
     echo "Testing invalid dropins..."
     # Assertion failed on earlier versions, command exits unsuccessfully on later versions
     systemctl cat [email protected] || true
@@ -685,7 +685,7 @@ testcase_invalid_dropins () {
     return 0
 }
 
-testcase_symlink_dropin_directory () {
+testcase_symlink_dropin_directory() {
     # For issue #21920.
     echo "Testing symlink drop-in directory..."
     create_services test15-a

test/units/testsuite-16.sh

@@ -7,7 +7,7 @@ rm -f /test.log
 
 TESTLOG=/test.log.XXXXXXXX
 
-function wait_for()
+wait_for()
 {
     local service="${1:-wait_for: missing service argument}"
     local result="${2:-success}"
@@ -23,7 +23,7 @@ function wait_for()
     fi
 }
 
-function wait_for_timeout()
+wait_for_timeout()
 {
     local unit="$1"
     local time="$2"
@@ -117,4 +117,3 @@ if [[ -f "$TESTLOG" ]]; then
 fi
 
 touch /testok
-exit 0

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

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

test/units/testsuite-21.sh

@@ -107,6 +107,4 @@ for bus in "${SESSION_BUS_LIST[@]}"; do
     systemctl --machine '[email protected]' --user daemon-reexec
 done
 
-echo OK >/testok
-
-exit 0
+touch /testok