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>
NEX-3231 ZFS bootfs tests need some work (cleanup vdev file)
NEX-3131 ZFS bootfs tests need some work
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

@@ -22,21 +22,16 @@
 
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright 2015 Nexenta Systems, Inc.
-#
 
 #
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
+# Copyright 2015 Nexenta Systems, Inc.
 #
 
-#
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
-#
-
 . $STF_SUITE/include/libtest.shlib
 
 #
 # DESCRIPTION:
 #

@@ -55,11 +50,11 @@
         then
                 log_must zfs destroy $TESTPOOL/vol
         fi
         if poolexists $TESTPOOL
         then
-                log_must zpool destroy $TESTPOOL
+                log_must destroy_pool_no_force $TESTPOOL
         fi
         if [[ -f $VDEV ]]; then
                 log_must rm -f $VDEV
         fi
 }