svn commit: r322064 - projects/zfsd/head/tests/sys/cddl/zfs/include

[Alan Somers]

Author: asomers
Date: Fri Aug  4 21:41:42 2017
New Revision: 322064
URL: https://svnweb.freebsd.org/changeset/base/322064

Log:
  Don't fail a ZFS test if "zpool labelclear" fails
  
  tests/sys/cddl/zfs/include/libtest.kshlib
  	Unlike the prototype implementation of labelclear, the final
  	implementation fails if no label is found.  So ignore the status
  	during setup and teardown.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib

Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib	Fri Aug  4 21:38:34 2017	(r322063)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib	Fri Aug  4 21:41:42 2017	(r322064)
@@ -1845,7 +1845,7 @@ function cleanup_devices #vdevs
 	for device in $@; do
 		# Labelclear must happen first, otherwise it may interfere
 		# with the teardown/setup of GPT labels.
-		log_must $ZPOOL labelclear -f $device
+		$ZPOOL labelclear -f $device
 		# Only wipe partition tables for arguments that are disks,
 		# as opposed to slices (which are valid arguments here).
 		if camcontrol inquiry $device >/dev/null 2>&1; then