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 2009 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/userquota/userquota_common.kshlib
  
--- 24,34 ----
  # Copyright 2009 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/userquota/userquota_common.kshlib
  
*** 44,81 ****
  #
  
  function cleanup
  {
          if datasetexists $snapfs; then
!                 log_must $ZFS destroy $snapfs
          fi
  
          log_must cleanup_quota
  }
  
  log_onexit cleanup
  
  log_assert "Check the zfs userspace used and quota"
  
! log_must $ZFS set userquota@$QUSER1=100m $QFS
  
  mkmount_writable $QFS
  
! log_must user_run $QUSER1 $MKFILE 50m $QFILE
! $SYNC
  
  typeset snapfs=$QFS@snap
  
! log_must $ZFS snapshot $snapfs
  
! log_must eval "$ZFS userspace $QFS >/dev/null 2>&1"
! log_must eval "$ZFS userspace $snapfs >/dev/null 2>&1"
  
  for fs in "$QFS" "$snapfs"; do
          log_note "check the quota size in zfs userspace $fs"
!         log_must eval "$ZFS userspace $fs | $GREP $QUSER1 | $GREP 100M"
  
          log_note "check the user used size in zfs userspace $fs"
!         log_must eval "$ZFS userspace $fs | $GREP $QUSER1 | $GREP 50.0M"
  done
  
  log_pass "Check the zfs userspace used and quota"
--- 44,81 ----
  #
  
  function cleanup
  {
          if datasetexists $snapfs; then
!                 log_must zfs destroy $snapfs
          fi
  
          log_must cleanup_quota
  }
  
  log_onexit cleanup
  
  log_assert "Check the zfs userspace used and quota"
  
! log_must zfs set userquota@$QUSER1=100m $QFS
  
  mkmount_writable $QFS
  
! log_must user_run $QUSER1 mkfile 50m $QFILE
! sync
  
  typeset snapfs=$QFS@snap
  
! log_must zfs snapshot $snapfs
  
! log_must eval "zfs userspace $QFS >/dev/null 2>&1"
! log_must eval "zfs userspace $snapfs >/dev/null 2>&1"
  
  for fs in "$QFS" "$snapfs"; do
          log_note "check the quota size in zfs userspace $fs"
!         log_must eval "zfs userspace $fs | grep $QUSER1 | grep 100M"
  
          log_note "check the user used size in zfs userspace $fs"
!         log_must eval "zfs userspace $fs | grep $QUSER1 | grep 50.0M"
  done
  
  log_pass "Check the zfs userspace used and quota"