From owner-svn-src-projects@freebsd.org Sat May 21 02:31:40 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E77DB43B94 for ; Sat, 21 May 2016 02:31:40 +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 mx1.freebsd.org (Postfix) with ESMTPS id E69051AF8; Sat, 21 May 2016 02:31:39 +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 u4L2VdAq049307; Sat, 21 May 2016 02:31:39 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4L2VcYL049304; Sat, 21 May 2016 02:31:38 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201605210231.u4L2VcYL049304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sat, 21 May 2016 02:31:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300358 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Group: projects 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.22 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: Sat, 21 May 2016 02:31:40 -0000 Author: asomers Date: Sat May 21 02:31:38 2016 New Revision: 300358 URL: https://svnweb.freebsd.org/changeset/base/300358 Log: Improve the reliability of some zfsd functional tests tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Allow up to 20 seconds for the spare disk to detach after resilvering completes. tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh Shrink the size of the test pool so checksum errors are more likely to be generated with a small amount of I/O. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Sat May 21 02:29:35 2016 (r300357) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Sat May 21 02:31:38 2016 (r300358) @@ -81,7 +81,7 @@ function verify_assertion wait_until_resilvered # Check that the spare is deactivated - log_must check_state $TESTPOOL "$SPARE_DISK" "AVAIL" + wait_for_pool_dev_state_change 20 "$SPARE_DISK" "AVAIL" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh Sat May 21 02:29:35 2016 (r300357) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh Sat May 21 02:31:38 2016 (r300358) @@ -64,6 +64,7 @@ VDEV0=${TMPDIR}/file0.${TESTCASE_ID} VDEV1=${TMPDIR}/file1.${TESTCASE_ID} VDEVS="${VDEV0} ${VDEV1}" TESTFILE=/$TESTPOOL/testfile +VDEV_SIZE=192m function cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh Sat May 21 02:29:35 2016 (r300357) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh Sat May 21 02:31:38 2016 (r300358) @@ -67,6 +67,7 @@ SPARE_VDEV=${TMPDIR}/file2.${TESTCASE_ID BASIC_VDEVS="${VDEV0} ${VDEV1}" VDEVS="${BASIC_VDEVS} ${SPARE_VDEV}" TESTFILE=/$TESTPOOL/testfile +VDEV_SIZE=192m function cleanup