From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 17 Sep 2022 12:27:31 +0000 (+0900)
Subject: test-50-dissect: do not fail test on cleanup
X-Git-Tag: v252-rc1~156^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3fcb736781a1d6e989615f72a038e1cce7feae9;p=thirdparty%2Fsystemd.git

test-50-dissect: do not fail test on cleanup

These paths are read-only mount points. Hence, we cannot remove the
contents.
---

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