From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 21 Apr 2020 11:18:36 +0000 (+0200)
Subject: test: correctly clean up test artifacts
X-Git-Tag: v246-rc1~537
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80b44b38b585756960f99552e6cfe394a6cff521;p=thirdparty%2Fsystemd.git

test: correctly clean up test artifacts

Remove the artifact files indicating test result (testok, failed, and
skipped) just before running the test so we always get the latest and
most relevant result instead of incorrectly consuming previous results.

Discovered in https://github.com/systemd/systemd/pull/15378#issuecomment-616801873
---

diff --git a/test/test-functions b/test/test-functions
index d468efb0b7b..8389623c20c 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -234,6 +234,7 @@ run_qemu() {
 
     CONSOLE=ttyS0
 
+    rm -f "$initdir"/{testok,failed,skipped}
     # make sure the initdir is not mounted to avoid concurrent access
     cleanup_initdir
     umount_loopback
@@ -362,6 +363,7 @@ $QEMU_OPTIONS \
 # success), or 1 if nspawn is not available.
 run_nspawn() {
     [[ -d /run/systemd/system ]] || return 1
+    rm -f "$initdir"/{testok,failed,skipped}
 
     local _nspawn_cmd=(
         --register=no
@@ -2014,7 +2016,6 @@ test_setup() {
 
 test_run() {
     mount_initdir
-    rm -f "$initdir"/{testok,failed,skipped}
 
     if [ -z "$TEST_NO_QEMU" ]; then
         if run_qemu "$1"; then