From owner-svn-src-projects@freebsd.org Thu Feb 8 21:33:24 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31140F06B55 for ; Thu, 8 Feb 2018 21:33:24 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D39277F573; Thu, 8 Feb 2018 21:33:23 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE60F1BAF1; Thu, 8 Feb 2018 21:33:23 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18LXNqY073425; Thu, 8 Feb 2018 21:33:23 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LXN91073423; Thu, 8 Feb 2018 21:33:23 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802082133.w18LXN91073423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 8 Feb 2018 21:33:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329039 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear X-SVN-Commit-Revision: 329039 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Feb 2018 21:33:24 -0000 Author: asomers Date: Thu Feb 8 21:33:23 2018 New Revision: 329039 URL: https://svnweb.freebsd.org/changeset/base/329039 Log: Fix the zpool_clear tests when no disks are available zpool_clear_001 through 004 don't actually need disks, but setup.ksh uselessly creates a disk-backed pool anyway. Delete setup.ksh. zpool_clear_005 needs 3 disks. Declare it so. Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/setup.ksh Modified: 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/zpool_clear_test.sh Modified: 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 Thu Feb 8 21:28:10 2018 (r329038) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile Thu Feb 8 21:33:23 2018 (r329039) @@ -13,7 +13,6 @@ ${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 Modified: 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 Thu Feb 8 21:28:10 2018 (r329038) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Thu Feb 8 21:33:23 2018 (r329039) @@ -36,7 +36,6 @@ 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() @@ -60,7 +59,6 @@ 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() @@ -84,7 +82,6 @@ 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() @@ -108,7 +105,6 @@ zpool_clear_004_pos_body() . $(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() @@ -130,7 +126,7 @@ 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()