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/scrub_mirror/cleanup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/scrub_mirror/cleanup.ksh
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2007 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/scrub_mirror/default.cfg
  34   35  
  35   36  
  36   37  verify_runnable "global"
  37   38  
  38   39  df -F zfs -h | grep "$TESTFS " >/dev/null
  39   40  [[ $? == 0 ]] && log_must zfs umount -f $TESTDIR
  40   41  destroy_pool $TESTPOOL
       42 +[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR
  41   43  
  42   44  # recreate and destroy a zpool over the disks to restore the partitions to
  43   45  # normal
  44   46  if [[ -n $SINGLE_DISK ]]; then
  45   47          log_must cleanup_devices $MIRROR_PRIMARY
  46   48  else
  47   49          log_must cleanup_devices $MIRROR_PRIMARY $MIRROR_SECONDARY
  48   50  fi
  49   51  
  50   52  log_pass
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX