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>

*** 24,34 ****
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/reservation/reservation.shlib
  
--- 24,34 ----
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/reservation/reservation.shlib
  
*** 52,62 ****
  verify_runnable "both"
  
  function cleanup
  {
          for obj in $OBJ_LIST; do
!                 datasetexists $obj && log_must $ZFS destroy -f $obj
          done
  }
  
  log_onexit cleanup
  
--- 52,62 ----
  verify_runnable "both"
  
  function cleanup
  {
          for obj in $OBJ_LIST; do
!                 datasetexists $obj && log_must zfs destroy -f $obj
          done
  }
  
  log_onexit cleanup
  
*** 78,91 ****
          #
          # Note that when creating a regular volume we are implicitly
          # setting a reservation upon it (i.e. the size of the volume)
          # which we reset back to zero initially.
          #
!         log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
!         log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
!         log_must $ZFS set refreservation=none $TESTPOOL/$TESTVOL
!         log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
  fi
  
  
  for obj in $TESTPOOL/$TESTFS $OBJ_LIST; do
  
--- 78,91 ----
          #
          # Note that when creating a regular volume we are implicitly
          # setting a reservation upon it (i.e. the size of the volume)
          # which we reset back to zero initially.
          #
!         log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
!         log_must zfs set reservation=none $TESTPOOL/$TESTVOL
!         log_must zfs set refreservation=none $TESTPOOL/$TESTVOL
!         log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
  fi
  
  
  for obj in $TESTPOOL/$TESTFS $OBJ_LIST; do
  
*** 99,109 ****
          # the volume itself.
          #
          [[ $obj == $TESTPOOL/$TESTVOL ]] && \
              ((resv_size_set = vol_set_size - RESV_DELTA))
  
!         log_must $ZFS set reservation=$resv_size_set $obj
  
          resv_size_get=`get_prop reservation $obj`
          if [[ $resv_size_set != $resv_size_get ]]; then
                  log_fail "Reservation not the expected value " \
                      "($resv_size_set != $resv_size_get)"
--- 99,109 ----
          # the volume itself.
          #
          [[ $obj == $TESTPOOL/$TESTVOL ]] && \
              ((resv_size_set = vol_set_size - RESV_DELTA))
  
!         log_must zfs set reservation=$resv_size_set $obj
  
          resv_size_get=`get_prop reservation $obj`
          if [[ $resv_size_set != $resv_size_get ]]; then
                  log_fail "Reservation not the expected value " \
                      "($resv_size_set != $resv_size_get)"