]> git.proxmox.com Git - mirror_zfs.git/commitdiff
ZTS: Fix verify_fs_mount in delegate_common.kshlib
authorUmer Saleem <usaleem@ixsystems.com>
Tue, 10 Oct 2023 00:24:24 +0000 (05:24 +0500)
committerGitHub <noreply@github.com>
Tue, 10 Oct 2023 00:24:24 +0000 (17:24 -0700)
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 <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Umer Saleem <usaleem@ixsystems.com>
Closes #15376

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

index 3f2f089e81710188e14248548359bbb544d08167..5ddb6ca2ddc82cead83b70815821cce9e46bea28 100644 (file)
@@ -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