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
 
 #

@@ -46,11 +47,11 @@
 
 set -A pools "pool.$$" "pool123" "mypool"
 
 function cleanup {
         if poolexists $POOL ; then
-                log_must zpool destroy $POOL
+                log_must destroy_pool_no_force $POOL
         fi
         rm /bootfs_003.$$.dat
 }
 
 

@@ -77,10 +78,10 @@
         RES=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
         if [ $RES != "$POOL/$TESTFS" ]
         then
                 log_fail "Expected $RES == $POOL/$TESTFS"
         fi
-        log_must zpool destroy $POOL
+        log_must destroy_pool_no_force $POOL
         i=$(( $i + 1 ))
 done
 
 log_pass "Valid pool names are accepted by zpool set bootfs"