summaryrefslogtreecommitdiff
path: root/tests
diff options
authorGustavo Niemeyer <gustavo@niemeyer.net>2016-08-31 09:43:25 -0300
committerGitHub <noreply@github.com>2016-08-31 09:43:25 -0300
commit84dcb6347b41e96a9375da0f84015043c5621068 (patch)
tree9b6f4dd9c956ff071eb8002910ad9c17e8849b88 /tests
parent0b3afb4ca15bc529028e8a7bbaa203c474a37c6b (diff)
parent2dcf4c3d0011ace0fc78b6c5e99a171c9953a45a (diff)
Merge pull request #1788 from mvo5/feature/lazy-umount
snapstate: use umount --lazy when removing the mount units
Diffstat (limited to 'tests')
-rw-r--r--tests/main/op-remove-retry/task.yaml14
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/main/op-remove-retry/task.yaml b/tests/main/op-remove-retry/task.yaml
index c680291c5f..0f17c17cf2 100644
--- a/tests/main/op-remove-retry/task.yaml
+++ b/tests/main/op-remove-retry/task.yaml
@@ -1,4 +1,4 @@
-summary: Check that a remove operation is retried if the mount point is busy.
+summary: Check that a remove operation is working even if the mount point is busy.
restore: |
rm -f test-snapd-tools_1.0_all.snap
@@ -27,16 +27,12 @@ execute: |
echo "When we try to remove the snap"
snap remove test-snapd-tools &
- echo "Then it fails and retries to remove"
- snap list | grep -q test-snapd-tools
- wait_for_remove_state Doing
-
- echo "When the mount point is no longer busy"
- systemctl stop unmount-blocker
- wait_for_service unmount-blocker inactive
-
echo "Then the remove retry succeeds"
wait_for_remove_state Done
echo "And the snap is removed"
while snap list | grep -q test-snapd-tools; do sleep 1; done
+
+ # cleanup umount blocker
+ systemctl stop unmount-blocker
+ wait_for_service unmount-blocker inactive