ZTS: Fix zpool_status_-s

After commit 5e74ac51 which split and reordered the run files the
`zpool_status_-s` test began failing.  The new ordering placed
the test after a previous test which used `zpool replace` to replace
a disk but did not clear its label.  This resulted in the next test,
`zpool_status_-s`, failing because of the potentially active
pool being detected on the replaced vdev.

    /dev/loop0 is part of potentially active pool 'testpool'

Use the default_mirror_setup_noexit() and default_cleanup_noexit()
functions to create the pool in `zpool_status_-s`.  They use the -f
flag by default.

In the `scrub_after_resilver` test wipe the label during cleanup
to prevent future failures if the tests are again reordered.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9451

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 a5b58ec8ff24158454eb125117340d3c21644526..db4a4ad55ef13a926fc6a44730b74424c2ed0c76 100755 (executable)
--- 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 b6a3e71fdfaf6e3595e48ebcb36da5a750c11f49..c919ae608513a37f4601b1ffc6af0edcf1cea6d0 100755 (executable)
--- 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