Index: 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	(revision 300357)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh	(revision 300358)
@@ -1,99 +1,99 @@
 #!/usr/local/bin/ksh93 -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2014 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 #
 . $STF_SUITE/tests/hotspare/hotspare.kshlib
 . $STF_SUITE/tests/zfsd/zfsd.kshlib
 . $STF_SUITE/include/libsas.kshlib
 
 ################################################################################
 #
 # __stc_assertion_start
 #
 # ID: zfsd_autoreplace_003_pos
 #
 # DESCRIPTION: 
 #	In a pool with the autoreplace property set, a vdev will be
 #	replaced by physical path even if a spare is already active for that
 #	vdev
 #
 # STRATEGY:
 #	1. Create 1 storage pool with a hot spare
 #	2. Remove a vdev by disabling its SAS phy
 #	3. Wait for the hotspare to fully resilver
 #	4. Export the pool
 #	5. Reenable the missing dev's SAS phy
 #	6. Erase the missing dev's ZFS label
 #	7. Disable the missing dev's SAS phy again
 #	8. Import the pool
 #	9. Reenable the missing dev's SAS phy
 #	10. Verify that it does get added to the pool.
 #	11. Verify that the hotspare gets removed.
 #
 # TESTABILITY: explicit
 #
 # TEST_AUTOMATION_LEVEL: automated
 #
 # CODING STATUS: COMPLETED (2013-05-13)
 #
 # __stc_assertion_end
 #
 ###############################################################################
 
 verify_runnable "global"
 verify_disk_count "$DISKS" 5
 
 
 log_assert "A pool with the autoreplace property will replace disks by physical path"
 
 log_onexit autoreplace_cleanup
 
 function verify_assertion
 {
 	do_autoreplace "$SPARE_DISK"
 	# Verify that the original disk gets added to the pool
 	wait_for_pool_dev_state_change 20 $REMOVAL_DISK ONLINE
 
 	# Wait for resilvering to complete
 	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"
 }
 
 
 typeset SPARE_DISK=$DISK0
 typeset REMOVAL_DISK=$DISK1
 typeset POOLDEVS="$DISK1 $DISK2 $DISK3 $DISK4"
 set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
 ensure_zfsd_running
 for keyword in "${MY_KEYWORDS[@]}" ; do
 	log_must create_pool $TESTPOOL $keyword $POOLDEVS spare $SPARE_DISK
 	log_must poolexists "$TESTPOOL"
 	log_must $ZPOOL set autoreplace=on $TESTPOOL
 	verify_assertion
 	destroy_pool "$TESTPOOL"
 done
Index: 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	(revision 300357)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh	(revision 300358)
@@ -1,90 +1,91 @@
 #!/usr/local/bin/ksh93 -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright (c) 2012,2013 Spectra Logic Corporation.  All rights reserved.
 # Use is subject to license terms.
 # 
 # $Id: $
 # $FreeBSD$
 
 . $STF_SUITE/include/libtest.kshlib
 . $STF_SUITE/tests/zfsd/zfsd.kshlib
 
 ################################################################################
 #
 # __stc_assertion_start
 #
 # ID: zfsd_degrade_001_pos
 #
 # DESCRIPTION: 
 #   If a vdev experiences checksum errors, it will become degraded.
 #       
 #
 # STRATEGY:
 #   1. Create a storage pool.  Only use the file vdevs because it is easy to
 #      generate checksum errors on them.
 #   2. Mostly fill the pool with data.
 #   3. Corrupt it by DDing to the underlying vdev
 #   4. Verify that the vdev becomes DEGRADED.
 #   5. ONLINE it and verify that it resilvers and joins the pool.
 #
 # TESTABILITY: explicit
 #
 # TEST_AUTOMATION_LEVEL: automated
 #
 # CODING STATUS: COMPLETED (2012-08-09)
 #
 # __stc_assertion_end
 #
 ###############################################################################
 
 verify_runnable "global"
 
 VDEV0=${TMPDIR}/file0.${TESTCASE_ID}
 VDEV1=${TMPDIR}/file1.${TESTCASE_ID}
 VDEVS="${VDEV0} ${VDEV1}"
 TESTFILE=/$TESTPOOL/testfile
+VDEV_SIZE=192m
 
 
 function cleanup
 {
 	destroy_pool $TESTPOOL
 	$RM -f $VDEVS
 }
 
 log_assert "ZFS will degrade a vdev that produces checksum errors"
 
 log_onexit cleanup
 
 log_must create_vdevs $VDEV0 $VDEV1
 ensure_zfsd_running
 for type in "raidz" "mirror"; do
 	log_note "Testing raid type $type"
 
 	create_pool $TESTPOOL $type ${VDEVS}
 	corrupt_pool_vdev $TESTPOOL $VDEV1 $TESTFILE
 	destroy_pool $TESTPOOL
 done
 
 cleanup
 log_pass
Index: 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	(revision 300357)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh	(revision 300358)
@@ -1,102 +1,103 @@
 #!/usr/local/bin/ksh93 -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright (c) 2012-2014 Spectra Logic Corporation.  All rights reserved.
 # Use is subject to license terms.
 # 
 # $Id: $
 # $FreeBSD$
 
 . $STF_SUITE/include/libtest.kshlib
 . $STF_SUITE/tests/zfsd/zfsd.kshlib
 
 ################################################################################
 #
 # __stc_assertion_start
 #
 # ID: zfsd_degrade_002_pos
 #
 # DESCRIPTION: 
 #   If an active hotspare experiences checksum errors, it will become degraded.
 #       
 #
 # STRATEGY:
 #   1. Create a storage pool with a hotspare.  Only use the file vdevs because
 #      it is easy to generate checksum errors on them.
 #   2. fault a vdev to active the hotspare
 #   3. Mostly fill the pool with data.
 #   4. Corrupt it by DDing to the hotspare's underlying file.
 #   5. Verify that the hotspare becomes DEGRADED.
 #   6. ONLINE it and verify that it resilvers and joins the pool.
 #
 # TESTABILITY: explicit
 #
 # TEST_AUTOMATION_LEVEL: automated
 #
 # CODING STATUS: COMPLETED (2014-05-13)
 #
 # __stc_assertion_end
 #
 ###############################################################################
 
 verify_runnable "global"
 
 VDEV0=${TMPDIR}/file0.${TESTCASE_ID}
 VDEV1=${TMPDIR}/file1.${TESTCASE_ID}
 SPARE_VDEV=${TMPDIR}/file2.${TESTCASE_ID}
 BASIC_VDEVS="${VDEV0} ${VDEV1}"
 VDEVS="${BASIC_VDEVS} ${SPARE_VDEV}"
 TESTFILE=/$TESTPOOL/testfile
+VDEV_SIZE=192m
 
 
 function cleanup
 {
 	destroy_pool $TESTPOOL
 	$RM -f $VDEVS
 }
 
 log_assert "ZFS will degrade a spare vdev that produces checksum errors"
 
 log_onexit cleanup
 
 ensure_zfsd_running
 log_must create_vdevs $VDEV0 $VDEV1 $SPARE_VDEV
 
 for type in "mirror" "raidz"; do
 	log_note "Testing raid type $type"
 
 	create_pool $TESTPOOL $type ${BASIC_VDEVS} spare ${SPARE_VDEV}
 
 	# Activate the hotspare
 	$ZINJECT -d ${VDEV0} -A fault $TESTPOOL
 
 	# ZFSD can take up to 60 seconds to replace a failed device
 	# (though it's usually faster).  
 	wait_for_pool_dev_state_change 60 $SPARE_VDEV INUSE
 
 	corrupt_pool_vdev $TESTPOOL $SPARE_VDEV $TESTFILE
 	destroy_pool $TESTPOOL
 done
 
 cleanup
 log_pass