From b5c189f699cb177ddb3dd9ca97d97ad83d2db384 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 6 Dec 2025 00:39:04 +0000 Subject: [PATCH] test: use -force with unsquashfs for test reruns In case a test is reran or a directory reused, overwrite it instead of failing (cherry picked from commit af80c9c22459b5051072e5b81cd7db7f4ca4290e) --- test/units/TEST-07-PID1.delegate-namespaces.sh | 2 +- test/units/TEST-07-PID1.private-pids.sh | 2 +- test/units/TEST-29-PORTABLE.directory.sh | 4 ++-- test/units/TEST-43-PRIVATEUSER-UNPRIV.sh | 4 ++-- test/units/TEST-50-DISSECT.dissect.sh | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/units/TEST-07-PID1.delegate-namespaces.sh b/test/units/TEST-07-PID1.delegate-namespaces.sh index 3fd1287fb23..d3c5061d169 100755 --- a/test/units/TEST-07-PID1.delegate-namespaces.sh +++ b/test/units/TEST-07-PID1.delegate-namespaces.sh @@ -70,7 +70,7 @@ testcase_user_manager() { } testcase_multiple_features() { - unsquashfs -no-xattrs -d /tmp/TEST-07-PID1-delegate-namespaces-root /usr/share/minimal_0.raw + unsquashfs -force -no-xattrs -d /tmp/TEST-07-PID1-delegate-namespaces-root /usr/share/minimal_0.raw systemd-run \ -p PrivatePIDs=yes \ diff --git a/test/units/TEST-07-PID1.private-pids.sh b/test/units/TEST-07-PID1.private-pids.sh index 091535e3da0..198f83d24d1 100755 --- a/test/units/TEST-07-PID1.private-pids.sh +++ b/test/units/TEST-07-PID1.private-pids.sh @@ -86,7 +86,7 @@ EOF } testcase_multiple_features() { - unsquashfs -no-xattrs -d /tmp/TEST-07-PID1-private-pids-root /usr/share/minimal_0.raw + unsquashfs -force -no-xattrs -d /tmp/TEST-07-PID1-private-pids-root /usr/share/minimal_0.raw systemd-run \ -p PrivatePIDs=yes \ diff --git a/test/units/TEST-29-PORTABLE.directory.sh b/test/units/TEST-29-PORTABLE.directory.sh index 2cbd7da009c..208761e582c 100755 --- a/test/units/TEST-29-PORTABLE.directory.sh +++ b/test/units/TEST-29-PORTABLE.directory.sh @@ -17,8 +17,8 @@ if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then ARGS+=(--profile=trusted) fi -unsquashfs -no-xattrs -d /tmp/minimal_0 /usr/share/minimal_0.raw -unsquashfs -no-xattrs -d /tmp/minimal_1 /usr/share/minimal_1.raw +unsquashfs -force -no-xattrs -d /tmp/minimal_0 /usr/share/minimal_0.raw +unsquashfs -force -no-xattrs -d /tmp/minimal_1 /usr/share/minimal_1.raw portablectl "${ARGS[@]}" attach --copy=symlink --now --runtime /tmp/minimal_0 minimal-app0 diff --git a/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh b/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh index 0805a5caf94..3bb9973b041 100755 --- a/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh +++ b/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh @@ -117,7 +117,7 @@ if sysctl kernel.dmesg_restrict=0; then dmesg) fi -unsquashfs -no-xattrs -d /tmp/img /usr/share/minimal_0.raw +unsquashfs -force -no-xattrs -d /tmp/img /usr/share/minimal_0.raw runas testuser systemd-run --wait --user --unit=test-root-dir \ -p RootDirectory=/tmp/img \ grep MARKER=1 /etc/os-release @@ -132,7 +132,7 @@ umount /tmp/img_bind # Unprivileged overlayfs was added to Linux 5.11, so try to detect it first mkdir -p /tmp/a /tmp/b /tmp/c if unshare --mount --user --map-root-user mount -t overlay overlay /tmp/c -o lowerdir=/tmp/a:/tmp/b; then - unsquashfs -no-xattrs -d /tmp/app2 /tmp/app1.raw + unsquashfs -force -no-xattrs -d /tmp/app2 /tmp/app1.raw runas testuser systemd-run --wait --user --unit=test-extension-dir \ -p ExtensionDirectories=/tmp/app2 \ -p TemporaryFileSystem=/run -p RootDirectory=/tmp/img \ diff --git a/test/units/TEST-50-DISSECT.dissect.sh b/test/units/TEST-50-DISSECT.dissect.sh index d6ce51c1ebe..a594e2945ab 100755 --- a/test/units/TEST-50-DISSECT.dissect.sh +++ b/test/units/TEST-50-DISSECT.dissect.sh @@ -679,7 +679,7 @@ grep -q -F "MARKER=1" /tmp/markers/50i systemctl stop testservice-50i.service rm -f /run/systemd/system/testservice-50i.service -unsquashfs -no-xattrs -d /tmp/vpickminimg "$MINIMAL_IMAGE.raw" +unsquashfs -force -no-xattrs -d /tmp/vpickminimg "$MINIMAL_IMAGE.raw" cat >/run/systemd/system/testservice-50j.service <>testkit/usr/lib/extension-release.d/extension-release echo "MARKER_SYSEXT_123" >testkit/usr/lib/testfile mksquashfs testkit/ testkit.raw -noappend cp testkit.raw /run/extensions/ -unsquashfs -l /run/extensions/testkit.raw +unsquashfs -force -l /run/extensions/testkit.raw systemd-dissect --no-pager /run/extensions/testkit.raw | grep -q '✓ sysext for portable service' systemd-dissect --no-pager /run/extensions/testkit.raw | grep -q '✓ sysext for system' systemd-sysext merge @@ -923,7 +923,7 @@ echo "ARCHITECTURE=_any" >>testjob/etc/extension-release.d/extension-release.tes echo "MARKER_CONFEXT_123" >testjob/etc/testfile mksquashfs testjob/ testjob.raw -noappend cp testjob.raw /run/confexts/ -unsquashfs -l /run/confexts/testjob.raw +unsquashfs -force -l /run/confexts/testjob.raw systemd-dissect --no-pager /run/confexts/testjob.raw | grep -q '✓ confext for system' systemd-dissect --no-pager /run/confexts/testjob.raw | grep -q '✓ confext for portable service' systemd-confext merge