From 3eba666332629bffc5c247326939556b511af6e7 Mon Sep 17 00:00:00 2001 From: bunder2015 Date: Sun, 15 Apr 2018 18:17:44 -0400 Subject: [PATCH] ZTS: zpool_create_002 clean up leftover filedisk zpool_create_002_pos did not clean up filedisk files left over from running the test. Reviewed-by: Giuseppe Di Natale Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: bunder2015 Closes #7435 Closes #7439 --- .../functional/cli_root/zpool_create/zpool_create_002_pos.ksh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh index bc50b65cc6..b98e5ac92f 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh @@ -50,14 +50,14 @@ function cleanup for pool in $TESTPOOL $TESTPOOL1 $TESTPOOL2 $TESTPOOL3 $TESTPOOL4 \ $TESTPOOL5 $TESTPOOL6 do - poolexists $pool && destroy_pool $pool + destroy_pool $pool done clean_blockfile "$TESTDIR0 $TESTDIR1" for file in $FILEDISK0 $FILEDISK1 $FILEDISK2 do - if [[ -e $file ]]; then + if [[ -e $TEST_BASE_DIR/$file ]]; then rm -f $TEST_BASE_DIR/$file fi done