svn commit: r353284 - head/tests/sys/cddl/zfs/tests/cli_root/zpool_get

[Alan Somers]

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 at async_destroy"
     "feature at empty_bpobj"
     "feature at lz4_compress"
@@ -66,11 +67,14 @@ typeset -a properties=(
     "feature at bookmarks"
     "feature at filesystem_limits"
     "feature at large_blocks"
+    "feature at large_dnode"
     "feature at sha512"
     "feature at skein"
     # "feature at edonr" Edonr is not yet implemented on FreeBSD
     "feature at device_removal"
     "feature at obsolete_counts"
+    "feature at zpool_checkpoint"
+    "feature at 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