From owner-svn-src-head@freebsd.org Mon Oct 7 19:24:51 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 46626137A1C; Mon, 7 Oct 2019 19:24:51 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46n9R715fzz4Scc; Mon, 7 Oct 2019 19:24:51 +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 08D181B548; Mon, 7 Oct 2019 19:24:51 +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 x97JOoTQ051955; Mon, 7 Oct 2019 19:24:50 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x97JOocc051953; Mon, 7 Oct 2019 19:24:50 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201910071924.x97JOocc051953@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 7 Oct 2019 19:24:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353284 - head/tests/sys/cddl/zfs/tests/cli_root/zpool_get X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get X-SVN-Commit-Revision: 353284 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2019 19:24:51 -0000 Author: asomers Date: Mon Oct 7 19:24:50 2019 New Revision: 353284 URL: https://svnweb.freebsd.org/changeset/base/353284 Log: ZFS: fix the zpool_get_002_pos test ZFS has grown some additional properties that hadn't been added to the config file yet. While I'm here, improve the error message, and remove a superfluous command. MFC after: 2 weeks Sponsored by: Axcient Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_002_pos.ksh Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Mon Oct 7 19:05:05 2019 (r353283) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Mon Oct 7 19:24:50 2019 (r353284) @@ -54,6 +54,7 @@ typeset -a properties=( "fragmentation" "leaked" "bootsize" + "checkpoint" "feature@async_destroy" "feature@empty_bpobj" "feature@lz4_compress" @@ -66,11 +67,14 @@ typeset -a properties=( "feature@bookmarks" "feature@filesystem_limits" "feature@large_blocks" + "feature@large_dnode" "feature@sha512" "feature@skein" # "feature@edonr" Edonr is not yet implemented on FreeBSD "feature@device_removal" "feature@obsolete_counts" + "feature@zpool_checkpoint" + "feature@spacemap_v2" ) export DISK=${DISKS%% *} Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_002_pos.ksh ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_002_pos.ksh Mon Oct 7 19:05:05 2019 (r353283) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_002_pos.ksh Mon Oct 7 19:24:50 2019 (r353284) @@ -96,10 +96,10 @@ done # increment the counter to include the header line i=$(( $i + 1 )) -COUNT=$($WC $TMPDIR/values.${TESTCASE_ID} | $AWK '{print $1}') +COUNT=$($WC $TMPDIR/values.${TESTCASE_ID}) if [ $i -ne $COUNT ] then - log_fail "Length of output $COUNT was not equal to number of props + 1." + log_fail "Length of output $COUNT was not equal to number of props + 1 ($i)." fi