From 4016ad705bb45d4bc8b5884ac626e4b1c433e06a Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Sun, 3 Jan 2021 02:54:53 +0200 Subject: [PATCH] zfs_mount_all_mountpoints: cleanup_all should leave pool root mounted if pool root is not mounted, then zpool umount in next test will leave dataset mountpoint directory around and next zfs mount -a will fail with error: cannot mount '/testpool': directory is not empty Reviewed-by: Brian Behlendorf Signed-off-by: Toomas Soome Closes #11417 --- .../functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh index 3e6a24bbc..faeae4227 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh @@ -109,6 +109,8 @@ function cleanup_all export __ZFS_POOL_RESTRICT="$TESTPOOL" log_must zfs $unmountall unset __ZFS_POOL_RESTRICT + # make sure we leave $TESTPOOL mounted + log_must zfs mount $TESTPOOL for fs in ${filesystems[@]}; do cleanup_filesystem "$TESTPOOL" "$fs"