ZTS: delegate group path cleanup

Removing hardcoded paths in delegate group tests

Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Closes #7778

diff --git a/tests/zfs-tests/tests/functional/delegate/delegate.cfg b/tests/zfs-tests/tests/functional/delegate/delegate.cfg
index aaa67604839ecc709d5d74160a3d65a5ffe267a7..a9a46281b18502106ac055d4a4b3f16c48ce50c4 100644 (file)
--- a/tests/zfs-tests/tests/functional/delegate/delegate.cfg
+++ b/tests/zfs-tests/tests/functional/delegate/delegate.cfg
@@ -28,7 +28,7 @@
 # Copyright (c) 2013 by Delphix. All rights reserved.
 #
 
-export NISSTAFILE=/var/tmp/nis_state
+export NISSTAFILE=$TEST_BASE_DIR/nis_state
 
 export STAFF_GROUP=zfsgrp
 export STAFF1=staff1

diff --git a/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
index ebe2f4ba2494c9f53b68f0f358153445bdf9708f..6de1120f32ce7aed741a85290a41398295cd2c8a 100644 (file)
--- a/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
+++ b/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
@@ -384,8 +384,8 @@ function verify_send
        typeset -i ret=1
 
        log_must zfs snapshot $snap
-       typeset bak_user=/tmp/bak.$user.$stamp
-       typeset bak_root=/tmp/bak.root.$stamp
+       typeset bak_user=$TEST_BASE_DIR/bak.$user.$stamp
+       typeset bak_root=$TEST_BASE_DIR/bak.root.$stamp
 
        user_run $user eval "zfs send $snap > $bak_user"
        log_must eval "zfs send $snap > $bak_root"
@@ -410,8 +410,8 @@ function verify_fs_receive
        typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
        typeset newfs=$fs/newfs.$stamp
        typeset newvol=$fs/newvol.$stamp
-       typeset bak_user=/tmp/bak.$user.$stamp
-       typeset bak_root=/tmp/bak.root.$stamp
+       typeset bak_user=$TEST_BASE_DIR/bak.$user.$stamp
+       typeset bak_root=$TEST_BASE_DIR/bak.root.$stamp
 
        log_must zfs create $newfs
        typeset datasets="$newfs"
@@ -895,7 +895,7 @@ function verify_fs_mount
 
        typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
        typeset mntpt=$(get_prop mountpoint $fs)
-       typeset newmntpt=/tmp/mnt.$stamp
+       typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp
 
        if ismounted $fs ; then
                user_run $user zfs unmount $fs
@@ -963,7 +963,7 @@ function verify_fs_mountpoint
 
        typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
        typeset mntpt=$(get_prop mountpoint $fs)
-       typeset newmntpt=/tmp/mnt.$stamp
+       typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp
 
        if ! ismounted $fs ; then
                user_run $user zfs set mountpoint=$newmntpt $fs