From owner-svn-src-projects@freebsd.org Thu Aug 31 14:27:11 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 560D0E1FBD8 for ; Thu, 31 Aug 2017 14:27:11 +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 mx1.freebsd.org (Postfix) with ESMTPS id 308E37E537; Thu, 31 Aug 2017 14:27:11 +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 v7VERAIr058415; Thu, 31 Aug 2017 14:27:10 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VERAqQ058412; Thu, 31 Aug 2017 14:27:10 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708311427.v7VERAqQ058412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 31 Aug 2017 14:27:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323055 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_upgrade zpool_upgrade X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_upgrade zpool_upgrade X-SVN-Commit-Revision: 323055 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.23 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, 31 Aug 2017 14:27:11 -0000 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