aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToomas Soome <[email protected]>2021-01-03 02:54:53 +0200
committerGitHub <[email protected]>2021-01-02 16:54:53 -0800
commit4ba8c6b584dc23b2f2e11682ff06ed664f41107e (patch)
treef06fc44c54531c9c6d608d6a2b0d05ddd385ed97
parent064c2cf40ea367f0b7608a3e8b537f87190f52cb (diff)
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 <[email protected]> Signed-off-by: Toomas Soome <[email protected]> Closes #11417
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_mountpoints.ksh2
1 files changed, 2 insertions, 0 deletions
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"