From owner-svn-src-projects@freebsd.org Mon Jan 29 21:16:56 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA005EDF398 for ; Mon, 29 Jan 2018 21:16:56 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 880DB86DD8; Mon, 29 Jan 2018 21:16:56 +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 7EB6E5B50; Mon, 29 Jan 2018 21:16:56 +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 w0TLGuxw088176; Mon, 29 Jan 2018 21:16:56 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0TLGukJ088175; Mon, 29 Jan 2018 21:16:56 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201801292116.w0TLGukJ088175@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 29 Jan 2018 21:16:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r328563 - projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Commit-Revision: 328563 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jan 2018 21:16:57 -0000 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 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"