From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 12 Jul 2023 13:27:26 +0000 (+0200)
Subject: test: fail if we find units/tests in failed state
X-Git-Tag: v254-rc2~33^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74711e7a097b038293a91880ee721bef6cf1a658;p=thirdparty%2Fsystemd.git

test: fail if we find units/tests in failed state

Instead of relying on the post-test /failed file check.
---

diff --git a/test/units/testsuite-01.sh b/test/units/testsuite-01.sh
index 91dd47ca145..20744ac9163 100755
--- a/test/units/testsuite-01.sh
+++ b/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.
diff --git a/test/units/testsuite-02.sh b/test/units/testsuite-02.sh
index 97700e4439a..88e9d72ad1c 100755
--- a/test/units/testsuite-02.sh
+++ b/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)
@@ -112,4 +112,4 @@ set -x
 # Test logs are sometimes lost, as the system shuts down immediately after
 journalctl --sync
 
-exit 0
+test ! -s /failed