Print this page
NEX-3363 Test suites don't cleanup after themselves properly.
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@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/grow_pool/cleanup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/grow_pool/cleanup.ksh
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2009 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/include/libtest.shlib
  33   34  . $STF_SUITE/tests/functional/grow_pool/grow_pool.cfg
  34   35  
  35   36  verify_runnable "global"
  36   37  
  37      -ismounted $TESTFS && \
  38      -        log_must zfs umount $TESTDIR
  39      -destroy_pool "$TESTPOOL"
       38 +ismounted $TESTFS && log_must zfs umount $TESTDIR
       39 +destroy_pool $TESTPOOL
       40 +[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR
  40   41  
  41   42  #
  42   43  # Here we create & destroy a zpool using the disks
  43   44  # because this resets the partitions to normal
  44   45  #
  45   46  if [[ -z $DISK ]]; then
  46      -        create_pool ZZZ "$DISK0 $DISK1"
  47      -        destroy_pool ZZZ
       47 +        create_pool ZZZ "$DISK0 $DISK1"
       48 +        destroy_pool ZZZ
  48   49  else
  49      -        create_pool ZZZ "$DISK"
  50      -        destroy_pool ZZZ
       50 +        create_pool ZZZ "$DISK"
       51 +        destroy_pool ZZZ
  51   52  fi
  52   53  
  53   54  log_pass
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX