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/snapshot/snapshot_008_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_008_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 2007 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/snapshot/snapshot.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  # Verify that destroying snapshots returns space to the pool.
  38   38  #
  39   39  # STRATEGY:
↓ open down ↓ 3 lines elided ↑ open up ↑
  43   43  #
  44   44  
  45   45  verify_runnable "both"
  46   46  
  47   47  function cleanup
  48   48  {
  49   49          typeset -i i=1
  50   50          while [[ $i -lt $COUNT ]]; do
  51   51                  snapexists $SNAPFS.$i
  52   52                  [[ $? -eq 0 ]] && \
  53      -                        log_must $ZFS destroy $SNAPFS.$i
       53 +                        log_must zfs destroy $SNAPFS.$i
  54   54  
  55   55                  (( i = i + 1 ))
  56   56          done
  57   57  
  58   58          [[ -e $TESTDIR ]] && \
  59      -                log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
       59 +                log_must rm -rf $TESTDIR/* > /dev/null 2>&1
  60   60  }
  61   61  
  62   62  log_assert "Verify that destroying snapshots returns space to the pool."
  63   63  
  64   64  log_onexit cleanup
  65   65  
  66   66  [[ -n $TESTDIR ]] && \
  67      -    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
       67 +    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
  68   68  
  69   69  typeset -i COUNT=10
  70   70  
  71   71  orig_size=`get_prop available $TESTPOOL`
  72   72  
  73   73  log_note "Populate the $TESTDIR directory"
  74   74  typeset -i i=1
  75   75  while [[ $i -lt $COUNT ]]; do
  76      -        log_must $FILE_WRITE -o create -f $TESTDIR/file$i \
       76 +        log_must file_write -o create -f $TESTDIR/file$i \
  77   77             -b $BLOCKSZ -c $NUM_WRITES -d $i
  78   78  
  79      -        log_must $ZFS snapshot $SNAPFS.$i
       79 +        log_must zfs snapshot $SNAPFS.$i
  80   80          (( i = i + 1 ))
  81   81  done
  82   82  
  83   83  typeset -i i=1
  84   84  while [[ $i -lt $COUNT ]]; do
  85   85          log_must rm -rf $TESTDIR/file$i > /dev/null 2>&1
  86      -        log_must $ZFS destroy $SNAPFS.$i
       86 +        log_must zfs destroy $SNAPFS.$i
  87   87  
  88   88          (( i = i + 1 ))
  89   89  done
  90   90  
  91   91  new_size=`get_prop available $TESTPOOL`
  92   92  
  93   93  typeset -i tolerance=0
  94   94  
  95   95  (( tolerance = new_size - orig_size))
  96   96  if (( tolerance > LIMIT )); then
  97   97          log_fail "Space not freed. ($orig_size != $new_size)"
  98   98  fi
  99   99  
 100  100  log_pass "After destroying snapshots, the space is returned to the pool."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX