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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/cli_user/misc/cleanup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cli_user/misc/cleanup.ksh
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29   29  # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
       30 +# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  30   31  #
  31   32  
  32   33  . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
  33   34  . $STF_SUITE/include/libtest.shlib
  34   35  
  35   36  if poolexists $TESTPOOL.virt
  36   37  then
  37      -        log_must zpool destroy $TESTPOOL.virt
       38 +        log_must destroy_pool_no_force $TESTPOOL.virt
  38   39  fi
  39   40  
  40   41  if poolexists v1-pool
  41   42  then
  42      -        log_must zpool destroy v1-pool
       43 +        log_must destroy_pool_no_force v1-pool
  43   44  fi
  44   45  
  45   46  if [[ -f /tmp/zfstest_datastream.dat ]]
  46   47  then
  47   48          log_must rm -f /tmp/zfstest_datastream.dat
  48   49  fi
  49   50  
  50   51  default_cleanup
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX