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/reservation/reservation_011_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_011_pos.sh
↓ 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/reservation/reservation.shlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #
  38   38  # ZFS has two mechanisms dealing with space for datasets, namely
  39   39  # reservations and quotas. Setting one should not affect the other,
↓ open down ↓ 14 lines elided ↑ open up ↑
  54   54  {
  55   55          log_must zero_reservation $TESTPOOL/$TESTFS
  56   56  }
  57   57  
  58   58  log_onexit cleanup
  59   59  
  60   60  space_avail=`get_prop available $TESTPOOL`
  61   61  
  62   62  ((resv_size_set = (space_avail - RESV_DELTA) / 2))
  63   63  
  64      -fs_quota=`$ZFS get quota $TESTPOOL/$TESTFS`
       64 +fs_quota=`zfs get quota $TESTPOOL/$TESTFS`
  65   65  
  66      -log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS
       66 +log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS
  67   67  
  68      -new_fs_quota=`$ZFS get quota $TESTPOOL/$TESTFS`
       68 +new_fs_quota=`zfs get quota $TESTPOOL/$TESTFS`
  69   69  
  70   70  if [[ $fs_quota != $new_fs_quota ]]; then
  71   71          log_fail "Quota value on $TESTFS has changed " \
  72   72              "($fs_quota != $new_fs_quota)"
  73   73  fi
  74   74  
  75   75  log_pass "Quota settings unaffected by reservation settings"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX