From d3fcb736781a1d6e989615f72a038e1cce7feae9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 17 Sep 2022 21:27:31 +0900 Subject: [PATCH] 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 f8a447d1d9b..f39383abc5d 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 -- 2.47.3