diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-06-24 10:35:12 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-06-24 10:35:12 +0200 |
| commit | 7eb9a4623d63458b9dc315eedd800d84646bcb59 (patch) | |
| tree | ff3dbe7d749d4031e7167c4a67297fa1074477f1 /test/units/testsuite-29.sh | |
| parent | test: test the /boot endpoint under nspawn as well (diff) | |
| download | systemd-7eb9a4623d63458b9dc315eedd800d84646bcb59.tar.xz systemd-7eb9a4623d63458b9dc315eedd800d84646bcb59.zip | |
test: drop timeout when running portablectl
The deadlock should be resolved by #28123, so let's check if it's indeed
the case.
Diffstat (limited to '')
| -rwxr-xr-x | test/units/testsuite-29.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh index 1e4bd4ec42..86a13b10ba 100755 --- a/test/units/testsuite-29.sh +++ b/test/units/testsuite-29.sh @@ -28,8 +28,6 @@ if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then # With the trusted profile DynamicUser is disabled, so the storage is not in private/ STATE_DIRECTORY=/var/lib/ fi -# Bump the timeout if we're running with plain QEMU -[[ "$(systemd-detect-virt -v)" == "qemu" ]] && TIMEOUT=90 || TIMEOUT=30 systemd-dissect --no-pager /usr/share/minimal_0.raw | grep -q '✓ portable service' systemd-dissect --no-pager /usr/share/minimal_1.raw | grep -q '✓ portable service' @@ -49,9 +47,7 @@ systemctl is-active minimal-app0.service systemctl is-active minimal-app0-foo.service systemctl is-active minimal-app0-bar.service && exit 1 -# Running with sanitizers may freeze the invoked service. See issue #24147. -# Let's set timeout to improve performance. -timeout "$TIMEOUT" portablectl "${ARGS[@]}" reattach --now --runtime /usr/share/minimal_1.raw minimal-app0 +portablectl "${ARGS[@]}" reattach --now --runtime /usr/share/minimal_1.raw minimal-app0 systemctl is-active minimal-app0.service systemctl is-active minimal-app0-bar.service @@ -76,7 +72,7 @@ systemctl is-active minimal-app0.service systemctl is-active minimal-app0-foo.service systemctl is-active minimal-app0-bar.service && exit 1 -timeout "$TIMEOUT" portablectl "${ARGS[@]}" reattach --now --enable --runtime /tmp/minimal_1 minimal-app0 +portablectl "${ARGS[@]}" reattach --now --enable --runtime /tmp/minimal_1 minimal-app0 systemctl is-active minimal-app0.service systemctl is-active minimal-app0-bar.service @@ -100,7 +96,7 @@ grep -q -F "LogExtraFields=PORTABLE_ROOT=minimal_0.raw" /run/systemd/system.atta grep -q -F "LogExtraFields=PORTABLE_EXTENSION=app0.raw" /run/systemd/system.attached/app0.service.d/20-portable.conf grep -q -F "LogExtraFields=PORTABLE_EXTENSION_NAME_AND_VERSION=app" /run/systemd/system.attached/app0.service.d/20-portable.conf -timeout "$TIMEOUT" portablectl "${ARGS[@]}" reattach --now --runtime --extension /usr/share/app0.raw /usr/share/minimal_1.raw app0 +portablectl "${ARGS[@]}" reattach --now --runtime --extension /usr/share/app0.raw /usr/share/minimal_1.raw app0 systemctl is-active app0.service status="$(portablectl is-attached --extension app0 minimal_1)" @@ -120,13 +116,13 @@ status="$(portablectl is-attached --extension app1 minimal_0)" # Ensure that adding or removing a version to the image doesn't break reattaching cp /usr/share/app1.raw /tmp/app1_2.raw -timeout "$TIMEOUT" portablectl "${ARGS[@]}" reattach --now --runtime --extension /tmp/app1_2.raw /usr/share/minimal_1.raw app1 +portablectl "${ARGS[@]}" reattach --now --runtime --extension /tmp/app1_2.raw /usr/share/minimal_1.raw app1 systemctl is-active app1.service status="$(portablectl is-attached --extension app1_2 minimal_1)" [[ "${status}" == "running-runtime" ]] -timeout "$TIMEOUT" portablectl "${ARGS[@]}" reattach --now --runtime --extension /usr/share/app1.raw /usr/share/minimal_1.raw app1 +portablectl "${ARGS[@]}" reattach --now --runtime --extension /usr/share/app1.raw /usr/share/minimal_1.raw app1 systemctl is-active app1.service status="$(portablectl is-attached --extension app1 minimal_1)" |