Skip to content

Commit 250349f

Browse files
author
Umer Saleem
authored
ZTS: Fix verify_fs_mount in delegate_common.kshlib
verify_fs_mount expects the dataset to remain unmounted after updating the mountpoint property in delegate_common.kshlib. This commit updates verify_fs_mount and uses nomount parameter for zfs set to update the mountpoint property without mounting the dataset. This fixes the zfs_allow_010_pos test case, which was failing on FreeBSD after the behavior update in setting the mountpoint property. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Umer Saleem <[email protected]> Closes #15376
1 parent 954a380 commit 250349f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ function verify_fs_mount
861861
fi
862862

863863
if ! ismounted $fs ; then
864-
log_must zfs set mountpoint=$newmntpt $fs
864+
log_must zfs set -u mountpoint=$newmntpt $fs
865865
log_must rm -rf $newmntpt
866866
log_must mkdir $newmntpt
867867

@@ -878,7 +878,7 @@ function verify_fs_mount
878878
fi
879879
log_must zfs umount $fs
880880
log_must rm -rf $newmntpt
881-
log_must zfs set mountpoint=$mntpt $fs
881+
log_must zfs set -u mountpoint=$mntpt $fs
882882
fi
883883

884884
return 0

0 commit comments

Comments
 (0)