Print this page
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>
4206 history_003_pos relies on exact size of history log and entries
4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
Reviewed by: Sonu Pillai <sonu.pillai@delphix.com>
Reviewed by: Will Guyette <will.guyette@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

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

@@ -44,11 +45,11 @@
 verify_runnable "global"
 
 function cleanup
 {
         if poolexists $TESTPOOL1; then
-                log_must zpool destroy $TESTPOOL1
+                log_must destroy_pool_no_force $TESTPOOL1
         fi
 
         if [[ -f $pool_vdev ]]; then
                 rm -f $pool_vdev
         fi

@@ -62,11 +63,11 @@
 typeset pool_vdev=/var/tmp/pool_dev.$$
 
 log_must mkfile 500m $pool_vdev
 
 if poolexists $TESTPOOL1; then
-        zpool destroy $TESTPOOL1
+        destroy_pool_no_force $TESTPOOL1
 fi
 
 log_must zpool create -O userquota@$QUSER1=$UQUOTA_SIZE \
         -O groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1 $pool_vdev