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

[Alan Somers]

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