From f6cd374e47ca3b4588ba6fa3906742f3db2f6249 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 25 May 2026 12:57:51 +0100 Subject: [PATCH] test: ignore both kill and wait errors in TEST-87-AUX-UTILS-VM.vmspawn If the process already exited it's not just wait, but also kill that will fail, so guard them both Follow-up for d32bc9cd07e61e852c624f228dda8669f540bf6d --- test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh b/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh index faf767df4e4..0a33cbd60c5 100755 --- a/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh +++ b/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh @@ -156,7 +156,7 @@ varlinkctl call "$VARLINK_ADDR" io.systemd.MachineInstance.Resume '{}' sleep 0.5 # Kill the subscriber and check output -kill "$SUBSCRIBE_ALL_PID" 2>/dev/null; wait "$SUBSCRIBE_ALL_PID" 2>/dev/null || true +{ kill "$SUBSCRIBE_ALL_PID" 2>/dev/null && wait "$SUBSCRIBE_ALL_PID" 2>/dev/null; } || : cat "$WORKDIR/events-all.json" # Verify initial READY event @@ -180,7 +180,7 @@ sleep 0.2 varlinkctl call "$VARLINK_ADDR" io.systemd.MachineInstance.Resume '{}' sleep 0.5 -kill "$SUBSCRIBE_FILTER_PID" 2>/dev/null; wait "$SUBSCRIBE_FILTER_PID" 2>/dev/null || true +{ kill "$SUBSCRIBE_FILTER_PID" 2>/dev/null && wait "$SUBSCRIBE_FILTER_PID" 2>/dev/null; } || : cat "$WORKDIR/events-filtered.json" # Should have STOP but not RESUME -- 2.47.3