summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunder2015 <[email protected]>2018-08-13 11:24:02 -0400
committerBrian Behlendorf <[email protected]>2018-08-13 08:24:02 -0700
commit64e96969a88c21aebb2f8d982a8c345e55a2ae6c (patch)
tree3beb38eedd59d1421abd6cfa1f95ab3f342f2bdf
parentd02fa81c7835f1cce54a0cfe3c010a0766f49165 (diff)
ZTS: delegate group path cleanup
Removing hardcoded paths in delegate group tests Reviewed-by: Giuseppe Di Natale <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: bunder2015 <[email protected]> Closes #7778
-rw-r--r--tests/zfs-tests/tests/functional/delegate/delegate.cfg2
-rw-r--r--tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib12
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/zfs-tests/tests/functional/delegate/delegate.cfg b/tests/zfs-tests/tests/functional/delegate/delegate.cfg
index aaa676048..a9a46281b 100644
--- 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 ebe2f4ba2..6de1120f3 100644
--- 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