c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 10:24:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: delegate group path cleanup

Browse Source 
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
This commit is contained in:
bunder2015 2018-08-13 11:24:02 -04:00 committed by Brian Behlendorf
parent d02fa81c78
commit 64e96969a8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/zfs-tests/tests/functional/delegate/delegate.cfg
View File

@ -28,7 +28,7 @@
# Copyright (c) 2013 by Delphix. All rights reserved. # 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 STAFF_GROUP=zfsgrp
export STAFF1=staff1 export STAFF1=staff1

12
tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
View File

@ -384,8 +384,8 @@ function verify_send
typeset -i ret=1 typeset -i ret=1
log_must zfs snapshot $snap log_must zfs snapshot $snap
typeset bak_user=/tmp/bak.$user.$stamp typeset bak_user=$TEST_BASE_DIR/bak.$user.$stamp
typeset bak_root=/tmp/bak.root.$stamp typeset bak_root=$TEST_BASE_DIR/bak.root.$stamp
user_run $user eval "zfs send $snap > $bak_user" user_run $user eval "zfs send $snap > $bak_user"
log_must eval "zfs send $snap > $bak_root" 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 stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset newfs=$fs/newfs.$stamp typeset newfs=$fs/newfs.$stamp
typeset newvol=$fs/newvol.$stamp typeset newvol=$fs/newvol.$stamp
typeset bak_user=/tmp/bak.$user.$stamp typeset bak_user=$TEST_BASE_DIR/bak.$user.$stamp
typeset bak_root=/tmp/bak.root.$stamp typeset bak_root=$TEST_BASE_DIR/bak.root.$stamp
log_must zfs create $newfs log_must zfs create $newfs
typeset datasets="$newfs" typeset datasets="$newfs"
@ -895,7 +895,7 @@ function verify_fs_mount
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset mntpt=$(get_prop mountpoint $fs) typeset mntpt=$(get_prop mountpoint $fs)
typeset newmntpt=/tmp/mnt.$stamp typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp
if ismounted $fs ; then if ismounted $fs ; then
user_run $user zfs unmount $fs user_run $user zfs unmount $fs
@ -963,7 +963,7 @@ function verify_fs_mountpoint
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset mntpt=$(get_prop mountpoint $fs) typeset mntpt=$(get_prop mountpoint $fs)
typeset newmntpt=/tmp/mnt.$stamp typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp
if ! ismounted $fs ; then if ! ismounted $fs ; then
user_run $user zfs set mountpoint=$newmntpt $fs user_run $user zfs set mountpoint=$newmntpt $fs