svn commit: r328563 - projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare

Alan Somers asomers at FreeBSD.org
Mon Jan 29 21:16:57 UTC 2018


Author: asomers
Date: Mon Jan 29 21:16:56 2018
New Revision: 328563
URL: https://svnweb.freebsd.org/changeset/base/328563

Log:
  Fix invalid syntax introduced in r322067
  
  Also use the test flag -s rather than -f; this ensures that something has
  been written to the target file.
  
  Submitted by:	Dave Baukus <daveb at spectralogic.com>
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_004_neg.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_004_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_004_neg.ksh	Mon Jan 29 21:07:04 2018	(r328562)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_004_neg.ksh	Mon Jan 29 21:16:56 2018	(r328563)
@@ -107,15 +107,14 @@ function verify_assertion # dev
 	while (( i < iters )); do
 		start_all_wp
 		while true; do
-			if is_pool_resilvered "$TESTPOOL" -a \
-				[ -f "$TESTDIR/$TESTFILE.$i" ]; then
-				break;
+			if is_pool_resilvered "$TESTPOOL"; then
+				[ -s "$TESTDIR/$TESTFILE.$i" ] && break
 			fi
 			$SLEEP 2
 		done
 
 		kill_all_wp
-		log_must test -f $TESTDIR/$TESTFILE.$i
+		log_must test -s $TESTDIR/$TESTFILE.$i
 
 		log_must $ZPOOL offline $TESTPOOL $odev
 		log_must check_state $TESTPOOL $odev "offline"


More information about the svn-src-projects mailing list