btrfs-progs: tests: enhance common umount helper to take optional paths

The run_check_umount_test_dev umounts the TEST_DEV and also optionally
uses the arguments but this would not work as expected if the TEST_DEV
is not a vald path for umount (eg. a restored image).

Update the helper so it tries to umount all paths, or fallback to
TEST_DEV to keep the current behaviour.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/tests/common b/tests/common
index 2fac202..8e5d0cd 100644 (file)
--- a/tests/common
+++ b/tests/common
@@ -477,10 +477,14 @@ run_check_mount_test_dev()
        run_check $SUDO_HELPER mount -t btrfs $loop_opt "$@" "$TEST_DEV" "$TEST_MNT"
 }
 
        run_check $SUDO_HELPER mount -t btrfs $loop_opt "$@" "$TEST_DEV" "$TEST_MNT"
 }
 

+# $1-$n: optional paths to unmount, otherwise fallback to TEST_DEV

 run_check_umount_test_dev()
 {
        setup_root_helper
 run_check_umount_test_dev()
 {
        setup_root_helper

-       run_check $SUDO_HELPER umount "$@" "$TEST_DEV"
+       if [ "$#" = 0 ]; then
+               set -- "$TEST_DEV"
+       fi
+       run_check $SUDO_HELPER umount "$@"

 }
 
 check_kernel_support()
 }
 
 check_kernel_support()