From 759b4b4a2a9f4b64629d1a42280b9fbc011ff369 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 12 Sep 2022 00:37:01 +0900 Subject: [PATCH 1/2] test-50-dissect: check mount destination instead of mount source And rebreak long lines. This should take no effective change, just refactoring. --- test/units/testsuite-50.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index db39149eb2..f8a447d1d9 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -297,7 +297,14 @@ Type=notify RemainAfterExit=yes MountAPIVFS=yes PrivateTmp=yes -ExecStart=/bin/sh -c 'systemd-notify --ready; while ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do sleep 0.1; done; mount | grep -e "/dev/mapper/${roothash}-verity" -e "/dev/mapper/loop[0-9]*-verity" | grep -q -F "nosuid"' +ExecStart=/bin/sh -c ' \\ + systemd-notify --ready; \\ + while [[ ! -f /tmp/img/usr/lib/os-release ]] || ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do \\ + sleep 0.1; \\ + done; \\ + mount; \\ + mount | grep -F "on /tmp/img type squashfs" | grep -q -F "nosuid"; \\ +' EOF systemctl start testservice-50d.service From d3fcb736781a1d6e989615f72a038e1cce7feae9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 17 Sep 2022 21:27:31 +0900 Subject: [PATCH 2/2] test-50-dissect: do not fail test on cleanup These paths are read-only mount points. Hence, we cannot remove the contents. --- test/units/testsuite-50.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index f8a447d1d9..f39383abc5 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -7,13 +7,17 @@ set -o pipefail export SYSTEMD_LOG_LEVEL=debug -cleanup() -{ +cleanup() {( + set +ex + if [ -z "${image_dir}" ]; then return fi + umount "${image_dir}/app0" + umount "${image_dir}/app1" + umount "${image_dir}/app-nodistro" rm -rf "${image_dir}" -} +)} udevadm control --log-level=debug