mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Doing that in test_run() is not enough, since it's called only once and
spawns all QEMU/nspawn jobs.
This commit is contained in:
Frantisek Sumsal 2023-11-25 20:22:24 +01:00
parent 8add4a9801
commit 60f9c49b16
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/test-functions
View File

@ -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; }