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,34 ****
--- 25,35 ----
  # 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,56 ****
  
  set -A pools "pool.$$" "pool123" "mypool"
  
  function cleanup {
          if poolexists $POOL ; then
!                 log_must zpool destroy $POOL
          fi
          rm /bootfs_003.$$.dat
  }
  
  
--- 47,57 ----
  
  set -A pools "pool.$$" "pool123" "mypool"
  
  function cleanup {
          if poolexists $POOL ; then
!                 log_must destroy_pool_no_force $POOL
          fi
          rm /bootfs_003.$$.dat
  }
  
  
*** 77,86 ****
          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
          i=$(( $i + 1 ))
  done
  
  log_pass "Valid pool names are accepted by zpool set bootfs"
--- 78,87 ----
          RES=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
          if [ $RES != "$POOL/$TESTFS" ]
          then
                  log_fail "Expected $RES == $POOL/$TESTFS"
          fi
!         log_must destroy_pool_no_force $POOL
          i=$(( $i + 1 ))
  done
  
  log_pass "Valid pool names are accepted by zpool set bootfs"