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

ZTS: path cleanup

Browse Source 
Removing hardcoded paths in many scripts.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: bernie1995 <bernie.pikes@gmail.com>
Issue #7507 
Closes #7843
This commit is contained in:
bernie1995
2018-08-30 22:46:55 +02:00
committed by Brian Behlendorf
parent 6c6949acae
commit 0fe7c953b3
63 changed files with 184 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/cli_user/misc/cleanup.ksh
+2 -2
View File
@@ -42,9 +42,9 @@ then
log_must zpool destroy v1-pool
fi
if [[ -f /tmp/zfstest_datastream.dat ]]
if [[ -f $TEST_BASE_DIR/zfstest_datastream.dat ]]
then
log_must rm -f /tmp/zfstest_datastream.dat
log_must rm -f $TEST_BASE_DIR/zfstest_datastream.dat
fi
default_cleanup
tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
+3 -3
View File
@@ -69,12 +69,12 @@ log_must zfs unmount $TESTPOOL/$TESTFS/$TESTFS2.unmounted
# send our snapshot to a known file in /tmp
zfs send $TESTPOOL/$TESTFS@snap > /tmp/zfstest_datastream.dat
if [ ! -s /tmp/zfstest_datastream.dat ]
zfs send $TESTPOOL/$TESTFS@snap > $TEST_BASE_DIR/zfstest_datastream.dat
if [ ! -s $TEST_BASE_DIR/zfstest_datastream.dat ]
then
log_fail "ZFS send datafile was not created!"
fi
log_must chmod 644 /tmp/zfstest_datastream.dat
log_must chmod 644 $TEST_BASE_DIR/zfstest_datastream.dat
# create a filesystem that has particular properties to test set/get
tests/zfs-tests/tests/functional/cli_user/misc/zdb_001_neg.ksh
+8 -8
View File
@@ -44,21 +44,21 @@
function check_zdb
{
$@ > /tmp/zdb.$$
grep "Dataset mos" /tmp/zdb.$$
$@ > $TEST_BASE_DIR/zdb.$$
grep "Dataset mos" $TEST_BASE_DIR/zdb.$$
if [ $? -eq 0 ]
then
log_fail "$@ exited 0 when run as a non root user!"
fi
rm /tmp/zdb.$$
rm $TEST_BASE_DIR/zdb.$$
}
function cleanup
{
if [ -e /tmp/zdb_001_neg.$$.txt ]
if [ -e $TEST_BASE_DIR/zdb_001_neg.$$.txt ]
then
rm /tmp/zdb_001_neg.$$.txt
rm $TEST_BASE_DIR/zdb_001_neg.$$.txt
fi
}
@@ -68,10 +68,10 @@ verify_runnable "global"
log_assert "zdb can't run as a user on datasets, but can run without arguments"
log_onexit cleanup
log_must eval "zdb > /tmp/zdb_001_neg.$$.txt"
log_must eval "zdb > $TEST_BASE_DIR/zdb_001_neg.$$.txt"
# verify the output looks okay
log_must grep pool_guid /tmp/zdb_001_neg.$$.txt
log_must rm /tmp/zdb_001_neg.$$.txt
log_must grep pool_guid $TEST_BASE_DIR/zdb_001_neg.$$.txt
log_must rm $TEST_BASE_DIR/zdb_001_neg.$$.txt
# we shouldn't able to run it on any dataset
check_zdb zdb $TESTPOOL
tests/zfs-tests/tests/functional/cli_user/misc/zfs_001_neg.ksh
+4 -4
View File
@@ -44,16 +44,16 @@
function cleanup
{
if [ -e /tmp/zfs_001_neg.$$.txt ]
if [ -e $TEST_BASE_DIR/zfs_001_neg.$$.txt ]
then
rm /tmp/zfs_001_neg.$$.txt
rm $TEST_BASE_DIR/zfs_001_neg.$$.txt
fi
}
log_onexit cleanup
log_assert "zfs shows a usage message when run as a user"
eval "zfs > /tmp/zfs_001_neg.$$.txt 2>&1"
log_must grep "usage: zfs command args" /tmp/zfs_001_neg.$$.txt
eval "zfs > $TEST_BASE_DIR/zfs_001_neg.$$.txt 2>&1"
log_must grep "usage: zfs command args" $TEST_BASE_DIR/zfs_001_neg.$$.txt
log_pass "zfs shows a usage message when run as a user"
tests/zfs-tests/tests/functional/cli_user/misc/zfs_receive_001_neg.ksh
+1 -1
View File
@@ -46,7 +46,7 @@
log_assert "zfs receive returns an error when run as a user"
log_mustnot eval "zfs receive -d $TESTPOOL/$TESTFS/$TESTFS2 \
< /tmp/zfstest_datastream.dat"
< $TEST_BASE_DIR/zfstest_datastream.dat"
# verify that command actually did nothing
tests/zfs-tests/tests/functional/cli_user/misc/zfs_send_001_neg.ksh
+5 -5
View File
@@ -45,23 +45,23 @@
function cleanup
{
if [ -e /tmp/zfstest_datastream.$$ ]
if [ -e $TEST_BASE_DIR/zfstest_datastream.$$ ]
then
log_must rm /tmp/zfstest_datastream.$$
log_must rm $TEST_BASE_DIR/zfstest_datastream.$$
fi
}
log_assert "zfs send returns an error when run as a user"
log_onexit cleanup
log_mustnot eval "zfs send $TESTPOOL/$TESTFS@snap > /tmp/zfstest_datastream.$$"
log_mustnot eval "zfs send $TESTPOOL/$TESTFS@snap > $TEST_BASE_DIR/zfstest_datastream.$$"
# Now check that the above command actually did nothing
# We should have a non-zero-length file in /tmp
if [ -s /tmp/zfstest_datastream.$$ ]
if [ -s $TEST_BASE_DIR/zfstest_datastream.$$ ]
then
log_fail "A zfs send file was created in /tmp/zfstest_datastream.$$ !"
log_fail "A zfs send file was created in $TEST_BASE_DIR/zfstest_datastream.$$ !"
fi
log_pass "zfs send returns an error when run as a user"
tests/zfs-tests/tests/functional/cli_user/misc/zpool_001_neg.ksh
+4 -4
View File
@@ -45,16 +45,16 @@
function cleanup
{
if [ -e /tmp/zpool_001_neg.$$.txt ]
if [ -e $TEST_BASE_DIR/zpool_001_neg.$$.txt ]
then
rm /tmp/zpool_001_neg.$$.txt
rm $TEST_BASE_DIR/zpool_001_neg.$$.txt
fi
}
log_onexit cleanup
log_assert "zpool shows a usage message when run as a user"
eval "zpool > /tmp/zpool_001_neg.$$.txt 2>&1"
log_must grep "usage: zpool command args" /tmp/zpool_001_neg.$$.txt
eval "zpool > $TEST_BASE_DIR/zpool_001_neg.$$.txt 2>&1"
log_must grep "usage: zpool command args" $TEST_BASE_DIR/zpool_001_neg.$$.txt
log_pass "zpool shows a usage message when run as a user"
tests/zfs-tests/tests/functional/cli_user/misc/zpool_status_001_neg.ksh
+6 -6
View File
@@ -45,28 +45,28 @@
function check_pool_status
{
RESULT=$(grep "pool:" /tmp/pool-status.$$)
RESULT=$(grep "pool:" $TEST_BASE_DIR/pool-status.$$)
if [ -z "$RESULT" ]
then
log_fail "No pool: string found in zpool status output!"
fi
rm /tmp/pool-status.$$
rm $TEST_BASE_DIR/pool-status.$$
}
verify_runnable "global"
log_assert "zpool status works when run as a user"
log_must eval "zpool status > /tmp/pool-status.$$"
log_must eval "zpool status > $TEST_BASE_DIR/pool-status.$$"
check_pool_status
log_must eval "zpool status -v > /tmp/pool-status.$$"
log_must eval "zpool status -v > $TEST_BASE_DIR/pool-status.$$"
check_pool_status
log_must eval "zpool status $TESTPOOL> /tmp/pool-status.$$"
log_must eval "zpool status $TESTPOOL> $TEST_BASE_DIR/pool-status.$$"
check_pool_status
log_must eval "zpool status -v $TESTPOOL > /tmp/pool-status.$$"
log_must eval "zpool status -v $TESTPOOL > $TEST_BASE_DIR/pool-status.$$"
check_pool_status
log_pass "zpool status works when run as a user"
tests/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_003_pos.ksh
+1 -1
View File
@@ -54,7 +54,7 @@ log_onexit cleanup
log_assert "Verify 'zfs list -r' could display any children recursively."
tmpfile=/var/tmp/zfslist.out.$$
tmpfile=$TEST_BASE_DIR/zfslist.out.$$
children="$TESTPOOL/$TESTFS"
for fs in $DATASETS ; do
tests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_002_pos.ksh
+1 -1
View File
@@ -43,7 +43,7 @@
verify_runnable "both"
typeset tmpfile=/var/tmp/zfsiostat.out.$$
typeset tmpfile=$TEST_BASE_DIR/zfsiostat.out.$$
typeset -i stat_count=0
function cleanup