svn commit: r323055 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_upgrade zpool_upgrade

[Alan Somers]

Author: asomers
Date: Thu Aug 31 14:27:09 2017
New Revision: 323055
URL: https://svnweb.freebsd.org/changeset/base/323055

Log:
  Fix zfs_upgraded tests for zpool version 5000
  
  tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
  	Fix default_check_zfs_upgrade and default_setup_datasets
  	for zpool version 5000
  
  tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
  	Reenable zpool_upgrade_007_pos.  It passed more than 300
  	times, so the panic that it previously caused has
  	probably been fixed.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib	Thu Aug 31 14:21:32 2017	(r323054)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib	Thu Aug 31 14:27:09 2017	(r323055)
@@ -41,11 +41,22 @@ set -A spa_create_versions 9 15 24
 set -A zpl_upgrade_versions 3 4 5
 set -A spa_upgrade_versions 9 15 24
 
+function get_pool_version #pool
+{
+	typeset pool=$1
+	typeset vs=$(get_pool_prop version $pool)
+	if [ "$vs" = "-" ]; then
+		echo 5000
+	else
+		echo "$vs"
+	fi
+}
+
 function default_setup_datasets #rootfs
 {
 	typeset rootfs=$1
 	typeset pool=${rootfs%%/*}
-	typeset -i vp=$(get_pool_prop version $pool)
+	typeset -i vp=$(get_pool_version $pool)
 	typeset -i version	
 	typeset -i m
 	typeset -i spa_version
@@ -118,7 +129,7 @@ function default_check_zfs_upgrade #rootfs
 {
 	typeset rootfs=$1
 	typeset pool=${rootfs%%/*}
-	typeset -i vp=$(get_pool_prop version $pool)
+	typeset -i vp="$(get_pool_version $pool)"
 	typeset -i m
 	typeset -i spa_version
 	typeset -i zpl_version
@@ -151,7 +162,7 @@ function default_check_zfs_upgrade #rootfs
 			if (( spa_version != 0 )) && (( vp < spa_version )); then
 				log_mustnot eval '$ZFS upgrade $opt -a > /dev/null 2>&1'
 				log_must eval '$ZPOOL upgrade $pool > /dev/null 2>&1'
-				vp=$(get_pool_prop version $pool)
+				vp="$(get_pool_version $pool)"
 			fi
 		
 			log_must eval '$ZFS upgrade $opt -a > /dev/null 2>&1'

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh	Thu Aug 31 14:21:32 2017	(r323054)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh	Thu Aug 31 14:27:09 2017	(r323055)
@@ -199,7 +199,6 @@ zpool_upgrade_007_pos_head()
 }
 zpool_upgrade_007_pos_body()
 {
-	atf_fail "This test causes a panic on FreeBSD"
 	. $(atf_get_srcdir)/../../../include/default.cfg
 	. $(atf_get_srcdir)/zpool_upgrade.kshlib
 	. $(atf_get_srcdir)/zpool_upgrade.cfg