NEX-3974 Remove timing issues so the robot can run consistently
Reviewed by: Steve Peng <steve.peng@nexenta.com>
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>

@@ -25,10 +25,11 @@
 # Use is subject to license terms.
 #
 
 #
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
+# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 #

@@ -65,11 +66,11 @@
         then
                 log_must zpool status -v $POOL
                 log_fail \
                     "set/get failed on $POOL - expected $VAL == $POOL/$TESTFS"
         fi
-        log_must zpool destroy $POOL
+        log_must destroy_pool_no_force $POOL
 }
 
 function verify_no_bootfs { # $POOL
         POOL=$1
         log_must zfs create $POOL/$TESTFS

@@ -78,17 +79,17 @@
         if [ $VAL == "$POOL/$TESTFS" ]
         then
                 log_must zpool status -v $POOL
                 log_fail "set/get unexpectedly failed $VAL != $POOL/$TESTFS"
         fi
-        log_must zpool destroy $POOL
+        log_must destroy_pool_no_force $POOL
 }
 
 function cleanup {
         if poolexists $TESTPOOL
         then
-                log_must zpool destroy $TESTPOOL
+                log_must destroy_pool_no_force $TESTPOOL
         fi
         log_must rm $VDEV1 $VDEV2 $VDEV3 $VDEV4
 }
 
 log_assert "Pools of correct vdev types accept boot property"