From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sat, 25 Nov 2023 19:22:24 +0000 (+0100)
Subject: test: remove the reboot counter just before spawning container/VM
X-Git-Tag: v255-rc4~48^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60f9c49b16b087d2d7d419ef3a9972a2193f794f;p=thirdparty%2Fsystemd.git

test: remove the reboot counter just before spawning container/VM

Doing that in test_run() is not enough, since it's called only once and
spawns all QEMU/nspawn jobs.
---

diff --git a/test/test-functions b/test/test-functions
index e2d3f109a21..b054892e172 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -472,6 +472,8 @@ run_qemu() {
 
     local CONSOLE=ttyS0
 
+    # Reset the boot counter, if present
+    rm -f "${initdir:?}/var/tmp/.systemd_reboot_count"
     rm -f "$initdir"/{testok,failed,skipped}
     # make sure the initdir is not mounted to avoid concurrent access
     cleanup_initdir
@@ -645,6 +647,8 @@ run_qemu() {
 # success), or 1 if nspawn is not available.
 run_nspawn() {
     [[ -d /run/systemd/system ]] || return 1
+    # Reset the boot counter, if present
+    rm -f "${initdir:?}/var/tmp/.systemd_reboot_count"
     rm -f "${initdir:?}"/{testok,failed,skipped}
 
     local nspawn_cmd=()
@@ -3356,9 +3360,6 @@ test_run() {
     local test_id="${1:?}"
     mount_initdir
 
-    # Reset the boot counter, if present
-    rm -f "${initdir:?}/var/tmp/.systemd_reboot_count"
-
     if ! get_bool "${TEST_NO_QEMU:=}"; then
         if run_qemu "$test_id"; then
             check_result_qemu || { echo "qemu test failed"; return 1; }