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