Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19  #
  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      -# Copyright (c) 2013 by Delphix. All rights reserved.
       29 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  30   30  #
  31   31  
  32   32  . $STF_SUITE/include/libtest.shlib
  33   33  . $STF_SUITE/tests/functional/inuse/inuse.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  # format command will interfere with devices and spare devices that are in use
  38   38  # by exported pool.
  39   39  #
  40   40  # STRATEGY:
  41   41  # 1. Create a regular|mirror|raidz|raidz2 pool with the given disk
  42   42  # 2. Export the pool
  43   43  # 3. Try to format against the disk, verify it succeeds as expect.
  44   44  #
  45   45  
  46   46  verify_runnable "global"
  47   47  
  48   48  function cleanup
  49   49  {
  50      -        poolexists $TESTPOOL1 || $ZPOOL import $TESTPOOL1 >/dev/null 2>&1
       50 +        poolexists $TESTPOOL1 || zpool import $TESTPOOL1 >/dev/null 2>&1
  51   51  
  52   52          poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
  53   53  
  54   54          #
  55   55          # Tidy up the disks we used.
  56   56          #
  57   57          cleanup_devices $vdisks $sdisks
  58   58  }
  59   59  
  60   60  function verify_assertion #disks
↓ open down ↓ 23 lines elided ↑ open up ↑
  84   84                  slice=${slice##*s}
  85   85                  log_must set_partition $slice "" $FS_SIZE $disk
  86   86          done
  87   87  
  88   88          if [[ -n $SINGLE_DISK && -n ${vdevs[i]} ]]; then
  89   89                  (( i = i + 1 ))
  90   90                  continue
  91   91          fi
  92   92  
  93   93          create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
  94      -        log_must $ZPOOL export $TESTPOOL1
       94 +        log_must zpool export $TESTPOOL1
  95   95          verify_assertion "$vdisks $sdisks"
  96   96  
  97   97          if [[ ( $FS_DISK0 == $FS_DISK2 ) && -n ${vdevs[i]} ]]; then
  98   98                  (( i = i + 1 ))
  99   99                  continue
 100  100          fi
 101  101  
 102  102          if [[ ( $FS_DISK0 == $FS_DISK3 ) && ( ${vdevs[i]} == "raidz2" ) ]]; then
 103  103                  (( i = i + 1 ))
 104  104                  continue
 105  105          fi
 106  106  
 107  107          create_pool $TESTPOOL1 ${vdevs[i]} $vdisks spare $sdisks
 108      -        log_must $ZPOOL export $TESTPOOL1
      108 +        log_must zpool export $TESTPOOL1
 109  109          verify_assertion "$vdisks $sdisks"
 110  110  
 111  111          (( i = i + 1 ))
 112  112  done
 113  113  
 114  114  log_pass "Format over exported pool succeed."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX