Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: history path cleanup 

History tests were hard coded to use /tmp and didn't clean up
properly after testing.

Reviewed by: John Wren Kennedy <jwk404@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Issue #7507 
Closes #7600
This commit is contained in:
bunder2015 2018-06-06 13:00:22 -04:00 committed by Brian Behlendorf
parent 37fb3e4318
commit 62841115bc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/zfs-tests/tests/functional/history/cleanup.ksh
View File

@ -31,8 +31,6 @@
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
[[ -f $OLD_HISTORY ]] && rm -f $OLD_HISTORY rm -f $TEST_BASE_DIR/{old,tmp,new}_history.*
[[ -f $TMP_HISTORY ]] && rm -f $TMP_HISTORY
[[ -f $NEW_HISTORY ]] && rm -f $NEW_HISTORY
default_cleanup default_cleanup

6
tests/zfs-tests/tests/functional/history/history.cfg
View File

@ -32,9 +32,9 @@ export ZFSROOT=
export MPOOL=mpool.$$ export MPOOL=mpool.$$
export OLD_HISTORY=/tmp/old_history.$$ export OLD_HISTORY=$TEST_BASE_DIR/old_history.$$
export TMP_HISTORY=/tmp/tmp_history.$$ export TMP_HISTORY=$TEST_BASE_DIR/tmp_history.$$
export NEW_HISTORY=/tmp/new_history.$$ export NEW_HISTORY=$TEST_BASE_DIR/new_history.$$
export MIGRATEDPOOLNAME=${MIGRATEDPOOLNAME:-history_pool} export MIGRATEDPOOLNAME=${MIGRATEDPOOLNAME:-history_pool}
export TIMEZONE=${TIMEZONE:-US/Mountain} export TIMEZONE=${TIMEZONE:-US/Mountain}