From: Zygmunt Krynicki Date: Mon, 27 May 2024 14:27:51 +0000 (+0200) Subject: [PATCH 04/18] tests: use snapctl umount rather than umount X-Git-Tag: archive/raspbian/2.68.3-3+rpi1^2^2^2^2^2^2^2~15 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e8b64739e072d54d02c6bd3e6fea31d97c48b61a;p=snapd.git [PATCH 04/18] tests: use snapctl umount rather than umount Snapctl creates systemd mount units that may be activated again, so plain umount is insufficient to correctly undo all the changes. Signed-off-by: Zygmunt Krynicki Gbp-Pq: Name 0006-PATCH-04-18-tests-use-snapctl-umount-rather-than-umo.patch --- diff --git a/tests/regression/lp-2065077/task.yaml b/tests/regression/lp-2065077/task.yaml index 4f94fe15..bf0c1a42 100644 --- a/tests/regression/lp-2065077/task.yaml +++ b/tests/regression/lp-2065077/task.yaml @@ -16,7 +16,7 @@ prepare: | mkdir -p /var/snap/test-snapd-sh/common/base-files echo 'snapctl mount -o ro,bind,noatime,noexec /usr/share/base-files /var/snap/test-snapd-sh/common/base-files' | snap run --shell test-snapd-sh.sh mountpoint /var/snap/test-snapd-sh/common/base-files - tests.cleanup defer umount /var/snap/test-snapd-sh/common/base-files + tests.cleanup defer snap run --shell test-snapd-sh.sh -c \'snapctl umount /var/snap/test-snapd-sh/common/base-files\' tests.session prepare -u test tests.cleanup defer tests.session restore -u test