diff options
| author | Luca Boccassi <bluca@debian.org> | 2024-11-26 17:12:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-26 17:12:56 +0100 |
| commit | 0566bd96438913a84ba4b4496c6d052cd677f86c (patch) | |
| tree | 352f7da5967bd9f3bb65d5dba06c4bb0bf85f5ed /test | |
| parent | sd-varlink: fix bug when enqueuing messages with fds asynchronously (diff) | |
| parent | machine: add debug for systemd-nspawn@.service (diff) | |
| download | systemd-0566bd96438913a84ba4b4496c6d052cd677f86c.tar.xz systemd-0566bd96438913a84ba4b4496c6d052cd677f86c.zip | |
machine: increase timeouts in attempt to fix #35115 (#35117)
An attempt to fix https://github.com/systemd/systemd/issues/35115
Diffstat (limited to 'test')
| -rwxr-xr-x | test/units/TEST-13-NSPAWN.machined.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/units/TEST-13-NSPAWN.machined.sh b/test/units/TEST-13-NSPAWN.machined.sh index f9cbd92bba..59ba8c92db 100755 --- a/test/units/TEST-13-NSPAWN.machined.sh +++ b/test/units/TEST-13-NSPAWN.machined.sh @@ -22,6 +22,11 @@ trap at_exit EXIT systemctl service-log-level systemd-machined debug systemctl service-log-level systemd-importd debug +# per request in https://github.com/systemd/systemd/pull/35117 +systemctl edit --runtime --stdin 'systemd-nspawn@.service' --drop-in=debug.conf <<EOF +[Service] +Environment=SYSTEMD_LOG_LEVEL=debug +EOF # Mount temporary directory over /var/lib/machines to not pollute the image mkdir -p /var/lib/machines @@ -278,13 +283,13 @@ varlinkctl call /run/systemd/machine/io.systemd.Machine io.systemd.Machine.List # sending TRAP signal rm -f /var/lib/machines/long-running/trap varlinkctl call /run/systemd/machine/io.systemd.Machine io.systemd.Machine.Kill '{"name":"long-running", "whom": "leader", "signal": 5}' -timeout 30 bash -c "until test -e /var/lib/machines/long-running/trap; do sleep .5; done" +timeout 120 bash -c "until test -e /var/lib/machines/long-running/trap; do sleep .5; done" # test io.systemd.Machine.Terminate long_running_machine_start rm -f /var/lib/machines/long-running/terminate varlinkctl call /run/systemd/machine/io.systemd.Machine io.systemd.Machine.Terminate '{"name":"long-running"}' -timeout 10 bash -c "until test -e /var/lib/machines/long-running/terminate; 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 varlinkctl call /run/systemd/machine/io.systemd.Machine io.systemd.Machine.List '{\"name\":\"long-running\"}'; do sleep 0.5; done" # test io.systemd.Machine.Register @@ -356,7 +361,7 @@ journalctl --sync machinectl terminate container-without-os-release machinectl terminate long-running # wait for the container being stopped, otherwise acquiring image metadata by io.systemd.MachineImage.List may fail in the below. -timeout 10 bash -c "while machinectl status long-running &>/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 || : (ip addr show lo | grep -q 192.168.1.100) || ip address add 192.168.1.100/24 dev lo |