From 64e96969a88c21aebb2f8d982a8c345e55a2ae6c Mon Sep 17 00:00:00 2001 From: bunder2015 Date: Mon, 13 Aug 2018 11:24:02 -0400 Subject: [PATCH] ZTS: delegate group path cleanup Removing hardcoded paths in delegate group tests Reviewed-by: Giuseppe Di Natale Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: bunder2015 Closes #7778 --- .../zfs-tests/tests/functional/delegate/delegate.cfg | 2 +- .../tests/functional/delegate/delegate_common.kshlib | 12 ++++++------ 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 aaa6760483..a9a46281b1 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 ebe2f4ba24..6de1120f32 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