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/migration/cleanup.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/migration/cleanup.ksh
   1    1  #!/usr/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  
    | 
      ↓ 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/include/libtest.shlib
  33   34  . $STF_SUITE/tests/functional/migration/migration.cfg
  34   35  
  35   36  verify_runnable "global"
  36   37  
  37   38  ismounted $NONZFS_TESTDIR ufs
  38   39  (( $? == 0 )) && log_must umount -f $NONZFS_TESTDIR
  39   40  
  40   41  ismounted $TESTPOOL/$TESTFS
  41   42  [[ $? == 0 ]] && log_must zfs umount -f $TESTDIR
  42   43  destroy_pool $TESTPOOL
       44 +[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR
  43   45  
  44   46  # recreate and destroy a zpool over the disks to restore the partitions to
  45   47  # normal
  46   48  case $DISK_COUNT in
  47   49  0)
  48   50          log_note "No disk devices to restore"
  49   51          ;;
  50   52  1)
  51   53          log_must cleanup_devices $ZFS_DISK
  52   54          ;;
  53   55  *)
  54   56          log_must cleanup_devices $ZFS_DISK $NONZFS_DISK
  55   57          ;;
  56   58  esac
  57   59  
  58   60  log_pass
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX