aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUmer Saleem <[email protected]>2023-10-10 05:24:24 +0500
committerGitHub <[email protected]>2023-10-09 17:24:24 -0700
commit250349ffffbaefd356a28cc900ad73a3fe0e60c0 (patch)
treecb8020f9f584f9ddb2a556fc7de21bd45d6659ae /tests
parent954a380e19c9905deb2152275b13a0fb787b6923 (diff)
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
Diffstat (limited to 'tests')
-rw-r--r--tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
index 3f2f089e8..5ddb6ca2d 100644
--- a/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
+++ b/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
@@ -861,7 +861,7 @@ function verify_fs_mount
fi
if ! ismounted $fs ; then
- log_must zfs set mountpoint=$newmntpt $fs
+ log_must zfs set -u mountpoint=$newmntpt $fs
log_must rm -rf $newmntpt
log_must mkdir $newmntpt
@@ -878,7 +878,7 @@ function verify_fs_mount
fi
log_must zfs umount $fs
log_must rm -rf $newmntpt
- log_must zfs set mountpoint=$mntpt $fs
+ log_must zfs set -u mountpoint=$mntpt $fs
fi
return 0