Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/setup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/setup.ksh (revision 329038) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/setup.ksh (nonexistent) @@ -1,34 +0,0 @@ -#!/usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)setup.ksh 1.2 07/01/09 SMI" -# - -. $STF_SUITE/include/libtest.kshlib - -DISK=${DISKS%% *} - -default_setup $DISK Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile (revision 329038) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile (revision 329039) @@ -1,20 +1,19 @@ # $FreeBSD$ .include PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_clear FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zpool_clear_test ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= zpool_clear_003_neg.ksh ${PACKAGE}FILES+= zpool_clear_002_neg.ksh ${PACKAGE}FILES+= zpool_clear.cfg ${PACKAGE}FILES+= zpool_clear_001_pos.ksh -${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= zpool_clear_004_pos.ksh ${PACKAGE}FILES+= zpool_clear_005_pos.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh (revision 329038) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh (revision 329039) @@ -1,154 +1,150 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the # Common Development and Distribution License (the "License"). # You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. # See the License for the specific language governing permissions # and limitations under the License. # # When distributing Covered Code, include this CDDL HEADER in each # file and include the License file at usr/src/OPENSOLARIS.LICENSE. # If applicable, add the following below this CDDL HEADER, with the # fields enclosed by brackets "[]" replaced with your own identifying # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END # # # Copyright 2012 Spectra Logic. All rights reserved. # Use is subject to license terms. # atf_test_case zpool_clear_001_pos cleanup zpool_clear_001_pos_head() { atf_set "descr" "Verify 'zpool clear' can clear errors of a storage pool." atf_set "require.progs" zpool zfs atf_set "timeout" 2100 } zpool_clear_001_pos_body() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_clear_001_pos.ksh || atf_fail "Testcase failed" } zpool_clear_001_pos_cleanup() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } atf_test_case zpool_clear_002_neg cleanup zpool_clear_002_neg_head() { atf_set "descr" "Execute 'zpool clear' using invalid parameters." atf_set "require.progs" zpool atf_set "timeout" 2100 } zpool_clear_002_neg_body() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_clear_002_neg.ksh || atf_fail "Testcase failed" } zpool_clear_002_neg_cleanup() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } atf_test_case zpool_clear_003_neg cleanup zpool_clear_003_neg_head() { atf_set "descr" "Verify 'zpool clear' cannot clear error for available spare devices." atf_set "require.progs" zpool atf_set "timeout" 2100 } zpool_clear_003_neg_body() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_clear_003_neg.ksh || atf_fail "Testcase failed" } zpool_clear_003_neg_cleanup() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } atf_test_case zpool_clear_004_pos cleanup zpool_clear_004_pos_head() { atf_set "descr" "Verify 'zpool clear' can work on spare vdevs" atf_set "require.progs" zpool atf_set "timeout" 2100 } zpool_clear_004_pos_body() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg atf_expect_fail "https://www.illumos.org/issues/8641 zpool clear doesn't work on spare or replacing vdevs" - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_clear_004_pos.ksh || atf_fail "Testcase failed" } zpool_clear_004_pos_cleanup() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } atf_test_case zpool_clear_005_pos cleanup zpool_clear_005_pos_head() { atf_set "descr" "'zpool clear' can online an UNAVAIL pool after all vdevs have reappeared" atf_set "require.progs" gnop zpool } zpool_clear_005_pos_body() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" + verify_disk_count "$DISKS" 3 ksh93 $(atf_get_srcdir)/zpool_clear_005_pos.ksh || atf_fail "Testcase failed" } zpool_clear_005_pos_cleanup() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } atf_init_test_cases() { atf_add_test_case zpool_clear_001_pos atf_add_test_case zpool_clear_002_neg atf_add_test_case zpool_clear_003_neg atf_add_test_case zpool_clear_004_pos atf_add_test_case zpool_clear_005_pos }