summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh1
-rwxr-xr-xtests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh4
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh b/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh
index a5b58ec8f..db4a4ad55 100755
--- a/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh
+++ b/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh
@@ -42,6 +42,7 @@ function cleanup
# Restore our zed.rc
log_must zed_rc_restore $zedrc_backup
default_cleanup_noexit
+ log_must zpool labelclear -f $DISK1
}
log_onexit cleanup
diff --git a/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh b/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh
index b6a3e71fd..c919ae608 100755
--- a/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh
+++ b/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh
@@ -41,14 +41,14 @@ DISK=${DISKS%% *}
verify_runnable "both"
-log_must zpool create $TESTPOOL mirror ${DISKS}
+default_mirror_setup_noexit $DISKS
function cleanup
{
log_must zinject -c all
log_must set_tunable64 zio_slow_io_ms $OLD_SLOW_IO
log_must set_tunable64 zfs_slow_io_events_per_second $OLD_SLOW_IO_EVENTS
- log_must destroy_pool $TESTPOOL
+ default_cleanup_noexit
}
log_onexit cleanup