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

ZTS: three small follow up fixes for #11167

Browse Source 
Follow up fix for 0cb40fa3. Remove unused variables, don't source
unused libs and add missed cleanup.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Attila Fülöp <attila@fueloep.org>
Closes #11311
This commit is contained in:
Attila Fülöp 2020-12-10 06:27:12 +01:00 committed by GitHub
parent 957f9681eb
commit b9916b4064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_dryrun_output.ksh
View File

@ -25,9 +25,7 @@
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
typeset TMPFILE_PREFIX="$TEST_BASE_DIR/zpool_add_dryrun_output"
typeset STR_DRYRUN="would update '$TESTPOOL' to the following configuration:" typeset STR_DRYRUN="would update '$TESTPOOL' to the following configuration:"
typeset VDEV_PREFIX="$TEST_BASE_DIR/filedev" typeset VDEV_PREFIX="$TEST_BASE_DIR/filedev"
@ -136,7 +134,7 @@ verify_runnable "global"
function cleanup function cleanup
{ {
destroy_pool "$TESTPOOL" destroy_pool "$TESTPOOL"
rm -f "$TMPFILE_PREFIX"* "$VDEV_PREFIX"* rm -f "$VDEV_PREFIX"*
} }
log_assert "'zpool add -n <pool> <vdev> ...' can display the configuration" log_assert "'zpool add -n <pool> <vdev> ...' can display the configuration"

7
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_dryrun_output.ksh
View File

@ -25,9 +25,7 @@
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/cli_root/zpool_create/zpool_create.shlib
typeset TMPFILE_PREFIX="$TEST_BASE_DIR/zpool_create_dryrun_output"
typeset STR_DRYRUN="would create '$TESTPOOL' with the following layout:" typeset STR_DRYRUN="would create '$TESTPOOL' with the following layout:"
typeset VDEV_PREFIX="$TEST_BASE_DIR/filedev" typeset VDEV_PREFIX="$TEST_BASE_DIR/filedev"
@ -36,7 +34,7 @@ typeset VDEV_PREFIX="$TEST_BASE_DIR/filedev"
# 'zpool create -n <pool> <vdev> ...' can display the correct configuration # 'zpool create -n <pool> <vdev> ...' can display the correct configuration
# #
# STRATEGY: # STRATEGY:
# 1. Create a storage pool # 1. Create -n a storage pool and verify the output is as expected.
# #
typeset -a dev=( typeset -a dev=(
@ -112,13 +110,12 @@ verify_runnable "global"
function cleanup function cleanup
{ {
rm -f "$TMPFILE_PREFIX"* "$VDEV_PREFIX"* rm -f "$VDEV_PREFIX"*
} }
log_assert "'zpool add -n <pool> <vdev> ...' can display the configuration" log_assert "'zpool add -n <pool> <vdev> ...' can display the configuration"
log_onexit cleanup log_onexit cleanup
typeset disk1=$(create_blockfile $FILESIZE)
# Create needed file vdevs. # Create needed file vdevs.
for (( i=0; i < ${#dev[@]}; i+=1 )); do for (( i=0; i < ${#dev[@]}; i+=1 )); do

1
tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_dryrun_output.ksh
View File

@ -118,6 +118,7 @@ verify_runnable "global"
function cleanup function cleanup
{ {
destroy_pool "$TESTPOOL" destroy_pool "$TESTPOOL"
rm -f "$VDEV_PREFIX"*
} }
log_assert \ log_assert \