svn commit: r329048 - projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate

[Alan Somers]

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"
 }