From owner-svn-src-projects@freebsd.org Thu Feb 8 22:37:20 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 91BCCF0B7A9 for ; Thu, 8 Feb 2018 22:37:20 +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 4069082A9F; Thu, 8 Feb 2018 22:37:20 +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 3B69F1C4E6; Thu, 8 Feb 2018 22:37:20 +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 w18MbKX7004893; Thu, 8 Feb 2018 22:37:20 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18MbKv2004891; Thu, 8 Feb 2018 22:37:20 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802082237.w18MbKv2004891@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 22:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329048 - projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate X-SVN-Commit-Revision: 329048 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 22:37:20 -0000 Author: asomers Date: Thu Feb 8 22:37:19 2018 New Revision: 329048 URL: https://svnweb.freebsd.org/changeset/base/329048 Log: Add appropriate verify_disk_count statements to the delegate tests Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh Thu Feb 8 22:34:37 2018 (r329047) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh Thu Feb 8 22:37:19 2018 (r329048) @@ -36,6 +36,7 @@ zfs_allow_001_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_001_pos.ksh || atf_fail "Testcase failed" } @@ -61,6 +62,7 @@ zfs_allow_002_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_002_pos.ksh || atf_fail "Testcase failed" } @@ -86,6 +88,7 @@ zfs_allow_003_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_003_pos.ksh || atf_fail "Testcase failed" } @@ -111,6 +114,7 @@ zfs_allow_004_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_004_pos.ksh || atf_fail "Testcase failed" } @@ -136,6 +140,7 @@ zfs_allow_005_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_005_pos.ksh || atf_fail "Testcase failed" } @@ -161,6 +166,7 @@ zfs_allow_006_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_006_pos.ksh || atf_fail "Testcase failed" } @@ -186,6 +192,7 @@ zfs_allow_007_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_007_pos.ksh || atf_fail "Testcase failed" } @@ -211,6 +218,7 @@ zfs_allow_008_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_008_pos.ksh || atf_fail "Testcase failed" } @@ -236,6 +244,7 @@ zfs_allow_009_neg_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_009_neg.ksh || atf_fail "Testcase failed" } @@ -261,6 +270,7 @@ zfs_allow_010_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_010_pos.ksh || atf_fail "Testcase failed" } @@ -286,6 +296,7 @@ zfs_allow_011_neg_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_011_neg.ksh || atf_fail "Testcase failed" } @@ -311,6 +322,7 @@ zfs_allow_012_neg_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_012_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh Thu Feb 8 22:34:37 2018 (r329047) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh Thu Feb 8 22:37:19 2018 (r329048) @@ -36,6 +36,7 @@ zfs_unallow_001_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_001_pos.ksh || atf_fail "Testcase failed" } @@ -61,6 +62,7 @@ zfs_unallow_002_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_002_pos.ksh || atf_fail "Testcase failed" } @@ -86,6 +88,7 @@ zfs_unallow_003_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_003_pos.ksh || atf_fail "Testcase failed" } @@ -111,6 +114,7 @@ zfs_unallow_004_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_004_pos.ksh || atf_fail "Testcase failed" } @@ -136,6 +140,7 @@ zfs_unallow_005_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_005_pos.ksh || atf_fail "Testcase failed" } @@ -161,6 +166,7 @@ zfs_unallow_006_pos_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_006_pos.ksh || atf_fail "Testcase failed" } @@ -186,6 +192,7 @@ zfs_unallow_007_neg_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_007_neg.ksh || atf_fail "Testcase failed" } @@ -211,6 +218,7 @@ zfs_unallow_008_neg_body() . $(atf_get_srcdir)/delegate_common.kshlib . $(atf_get_srcdir)/delegate.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_008_neg.ksh || atf_fail "Testcase failed" }