svn commit: r329044 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: userquota zil

[Alan Somers]

Author: asomers
Date: Thu Feb  8 21:58:20 2018
New Revision: 329044
URL: https://svnweb.freebsd.org/changeset/base/329044

Log:
  Fix the userquota and zil cleanups when no disks are defined
  
  tests/sys/cddl/zfs/tests/userquota/cleanup.ksh
  tests/sys/cddl/zfs/tests/zil/cleanup.ksh
  	Don't do extraneous stuff during cleanup, and don't try to clear a disk
  	label if there is no $DISK.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh	Thu Feb  8 21:57:35 2018	(r329043)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh	Thu Feb  8 21:58:20 2018	(r329044)
@@ -34,10 +34,6 @@ if ! is_userquota_supported; then
 	log_unsupported "userquota is not supported in this system."
 fi
 
-log_must cleanup_quota
 log_must clean_user_group
-
-typeset mntp=$(get_prop mountpoint $QFS)
-log_must $CHMOD 0755 $mntp
 
 default_cleanup

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh	Thu Feb  8 21:57:35 2018	(r329043)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh	Thu Feb  8 21:58:20 2018	(r329044)
@@ -33,4 +33,5 @@
 # clear its label with labelclear instead of relying on zpool destroy
 DISK=${DISKS%% *}
 $ZPOOL destroy -f $TESTPOOL
-$ZPOOL labelclear -f $DISK
+[ -n "$DISK" ] && $ZPOOL labelclear -f $DISK
+log_pass