From a1000c075b5338e17c64ecf233c478ae59bf4fd0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 4 Jul 2025 01:25:26 +0100 Subject: [PATCH] test: bump machinectl timeouts from 10s to 30s Nested arm64 VMs are very slow, bump the timeouts --- test/units/TEST-13-NSPAWN.machined.sh | 16 ++++++++-------- test/units/TEST-13-NSPAWN.nss-mymachines.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/units/TEST-13-NSPAWN.machined.sh b/test/units/TEST-13-NSPAWN.machined.sh index 365d2a25e62..d466662f966 100755 --- a/test/units/TEST-13-NSPAWN.machined.sh +++ b/test/units/TEST-13-NSPAWN.machined.sh @@ -13,7 +13,7 @@ at_exit() { set +e machinectl status long-running &>/dev/null && machinectl kill --signal=KILL long-running - mountpoint -q /var/lib/machines && timeout 10 sh -c "until umount /var/lib/machines; do sleep .5; done" + mountpoint -q /var/lib/machines && timeout 30 sh -c "until umount /var/lib/machines; do sleep .5; done" [[ -n "${NSPAWN_FRAGMENT:-}" ]] && rm -f "/etc/systemd/nspawn/$NSPAWN_FRAGMENT" "/var/lib/machines/$NSPAWN_FRAGMENT" rm -f /run/systemd/nspawn/*.nspawn } @@ -120,22 +120,22 @@ machinectl disable long-running long-running long-running container1 # Equivalent to machinectl kill --signal=SIGRTMIN+4 --kill-whom=leader rm -f /var/lib/machines/long-running/poweroff machinectl poweroff long-running -timeout 10 bash -c "until test -e /var/lib/machines/long-running/poweroff; do sleep .5; done" +timeout 30 bash -c "until test -e /var/lib/machines/long-running/poweroff; do sleep .5; done" # Equivalent to machinectl kill --signal=SIGINT --kill-whom=leader rm -f /var/lib/machines/long-running/reboot machinectl reboot long-running -timeout 10 bash -c "until test -e /var/lib/machines/long-running/reboot; do sleep .5; done" +timeout 30 bash -c "until test -e /var/lib/machines/long-running/reboot; do sleep .5; done" # Test for 'machinectl terminate' rm -f /var/lib/machines/long-running/terminate machinectl terminate long-running -timeout 10 bash -c "until test -e /var/lib/machines/long-running/terminate; do sleep .5; done" -timeout 10 bash -c "while machinectl status long-running &>/dev/null; do sleep .5; done" +timeout 30 bash -c "until test -e /var/lib/machines/long-running/terminate; do sleep .5; done" +timeout 30 bash -c "while machinectl status long-running &>/dev/null; do sleep .5; done" # Restart container long_running_machine_start # Test for 'machinectl kill' rm -f /var/lib/machines/long-running/trap machinectl kill --signal=SIGTRAP --kill-whom=leader long-running -timeout 10 bash -c "until test -e /var/lib/machines/long-running/trap; do sleep .5; done" +timeout 30 bash -c "until test -e /var/lib/machines/long-running/trap; do sleep .5; done" # Multiple machines at once machinectl poweroff long-running long-running long-running machinectl reboot long-running long-running long-running @@ -223,7 +223,7 @@ machinectl import-fs /var/tmp/container.dir container-dir machinectl start container-dir rm -fr /var/tmp/container.dir -timeout 10 bash -c "until machinectl clean --all; do sleep .5; done" +timeout 30 bash -c "until machinectl clean --all; do sleep .5; done" NSPAWN_FRAGMENT="machinectl-test-$RANDOM.nspawn" cat >"/var/lib/machines/$NSPAWN_FRAGMENT" </dev/null; do sleep .5; done" +timeout 30 bash -c "while machinectl status long-running &>/dev/null; do sleep .5; done" systemctl kill --signal=KILL systemd-nspawn@long-running.service || : # test io.systemd.MachineImage.List diff --git a/test/units/TEST-13-NSPAWN.nss-mymachines.sh b/test/units/TEST-13-NSPAWN.nss-mymachines.sh index cfae33b1b3b..a0dda919444 100755 --- a/test/units/TEST-13-NSPAWN.nss-mymachines.sh +++ b/test/units/TEST-13-NSPAWN.nss-mymachines.sh @@ -11,7 +11,7 @@ at_exit() { set +e machinectl kill --signal=KILL nss-mymachines-{noip,singleip,manyips} - mountpoint -q /var/lib/machines && timeout 10 sh -c "until umount /var/lib/machines; do sleep .5; done" + mountpoint -q /var/lib/machines && timeout 30 sh -c "until umount /var/lib/machines; do sleep .5; done" rm -f /run/systemd/nspawn/*.nspawn } -- 2.47.3