svn commit: r323119 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zfs_copies tests/cli_root/zpool_add tests/cli_root/zpool_destroy tests/cli_root/zpool_expand

[Alan Somers]

Author: asomers
Date: Fri Sep  1 21:06:31 2017
New Revision: 323119
URL: https://svnweb.freebsd.org/changeset/base/323119

Log:
  Conditionally skip ZFS tests that create zvol-backed pools
  
  By default creating zvol-backed pools is not allowed.  One must set
  vfs.zfs.vol.recursive to allow it.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib	Fri Sep  1 20:37:07 2017	(r323118)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib	Fri Sep  1 21:06:31 2017	(r323119)
@@ -3066,6 +3066,17 @@ function verify_disk_count
 }
 
 #
+# Verify that vfs.zfs.vol.recursive is set, so pools can be created using zvols
+# as backing stores.
+#
+function verify_zvol_recursive
+{
+	if [ "`sysctl -n vfs.zfs.vol.recursive`" -ne 1 ]; then
+		atf_skip "Recursive ZVOLs not enabled"
+	fi
+}
+
+#
 # bsdmap disk/slice number to a device path
 #
 function bsddevmap

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh	Fri Sep  1 20:37:07 2017	(r323118)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh	Fri Sep  1 21:06:31 2017	(r323119)
@@ -82,11 +82,11 @@ zfs_copies_003_pos_head()
 }
 zfs_copies_003_pos_body()
 {
-	atf_expect_fail "BUG26166 Cannot create pools on zvols"
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zfs_copies.kshlib
 	. $(atf_get_srcdir)/zfs_copies.cfg
 
+	verify_zvol_recursive
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zfs_copies_003_pos.ksh || atf_fail "Testcase failed"
 }

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh	Fri Sep  1 20:37:07 2017	(r323118)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh	Fri Sep  1 21:06:31 2017	(r323119)
@@ -115,11 +115,11 @@ zpool_add_004_pos_head()
 }
 zpool_add_004_pos_body()
 {
-	atf_expect_fail "BUG26166 Cannot create pools on zvols"
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_add.kshlib
 	. $(atf_get_srcdir)/zpool_add.cfg
 
+	verify_zvol_recursive
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_add_004_pos.ksh || atf_fail "Testcase failed"
 }

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh	Fri Sep  1 20:37:07 2017	(r323118)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh	Fri Sep  1 21:06:31 2017	(r323119)
@@ -33,10 +33,10 @@ zpool_destroy_001_pos_head()
 }
 zpool_destroy_001_pos_body()
 {
-	atf_expect_fail 'BUG26166 cannot create pools on zvols'
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_destroy.cfg
 
+	verify_zvol_recursive
 	ksh93 $(atf_get_srcdir)/zpool_destroy_001_pos.ksh || atf_fail "Testcase failed"
 }
 zpool_destroy_001_pos_cleanup()

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh	Fri Sep  1 20:37:07 2017	(r323118)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh	Fri Sep  1 21:06:31 2017	(r323119)
@@ -32,11 +32,10 @@ zpool_expand_001_pos_head()
 }
 zpool_expand_001_pos_body()
 {
-	atf_fail "This test causes a panic on FreeBSD"
-	atf_expect_fail 'BUG26166 cannot create pools on zvols'
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_expand.cfg
 
+	verify_zvol_recursive
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_expand_001_pos.ksh || atf_fail "Testcase failed"
 }
@@ -57,11 +56,10 @@ zpool_expand_002_pos_head()
 }
 zpool_expand_002_pos_body()
 {
-	atf_fail "This test causes a panic on FreeBSD"
-	atf_expect_fail 'BUG26166 cannot create pools on zvols'
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_expand.cfg
 
+	verify_zvol_recursive
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_expand_002_pos.ksh || atf_fail "Testcase failed"
 }
@@ -82,11 +80,10 @@ zpool_expand_003_neg_head()
 }
 zpool_expand_003_neg_body()
 {
-	atf_fail "This test causes a panic on FreeBSD"
-	atf_expect_fail 'BUG26166 cannot create pools on zvols'
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_expand.cfg
 
+	verify_zvol_recursive
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/zpool_expand_003_neg.ksh || atf_fail "Testcase failed"
 }