From 89f13af5f9476fd090b03f9131b8976e0bc5fbd6 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 25 May 2026 12:55:56 +0100 Subject: [PATCH 1/2] test: bump varlinkctl timeout in TEST-87-AUX-UTILS-VM.vmspawn 10s is too short for flaky/overloaded CI, and it sometimes fails 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 52de5b2f208..faf767df4e4 100755 --- a/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh +++ b/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh @@ -144,7 +144,7 @@ echo "Verified resumed state via Describe" # --- SubscribeEvents tests --- # Subscribe to all events in the background, collect output -varlinkctl call --more --timeout=10 "$VARLINK_ADDR" io.systemd.MachineInstance.SubscribeEvents '{}' \ +varlinkctl call --more --timeout=60 "$VARLINK_ADDR" io.systemd.MachineInstance.SubscribeEvents '{}' \ >"$WORKDIR/events-all.json" 2>&1 & SUBSCRIBE_ALL_PID=$! sleep 0.5 @@ -169,7 +169,7 @@ grep >/dev/null '"RESUME"' "$WORKDIR/events-all.json" echo "SubscribeEvents received STOP and RESUME events" # Test filtered subscription: only STOP events -varlinkctl call --more --timeout=10 "$VARLINK_ADDR" io.systemd.MachineInstance.SubscribeEvents '{"filter":["STOP"]}' \ +varlinkctl call --more --timeout=60 "$VARLINK_ADDR" io.systemd.MachineInstance.SubscribeEvents '{"filter":["STOP"]}' \ >"$WORKDIR/events-filtered.json" 2>&1 & SUBSCRIBE_FILTER_PID=$! sleep 0.5 From f6cd374e47ca3b4588ba6fa3906742f3db2f6249 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 25 May 2026 12:57:51 +0100 Subject: [PATCH 2/2] 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