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,11 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
 

@@ -48,11 +48,11 @@
 #
 
 function cleanup
 {
         if datasetexists $snap_fs; then
-                log_must $ZFS destroy $snap_fs
+                log_must zfs destroy $snap_fs
         fi
 
         log_must cleanup_quota
 }
 

@@ -60,29 +60,29 @@
 
 log_assert "Check the snapshot's user|group quota"
 typeset snap_fs=$QFS@snap
 
 
-log_must $ZFS set userquota@$QUSER1=$UQUOTA_SIZE $QFS
+log_must zfs set userquota@$QUSER1=$UQUOTA_SIZE $QFS
 log_must check_quota "userquota@$QUSER1" $QFS "$UQUOTA_SIZE"
 
-log_must $ZFS set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
+log_must zfs set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
 log_must check_quota "groupquota@$QGROUP" $QFS "$GQUOTA_SIZE"
 
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
 log_note "check the snapshot $snap_fs user|group quota"
 log_must check_quota "userquota@$QUSER1" $snap_fs "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $snap_fs "$GQUOTA_SIZE"
 
 log_note  "set userquota and groupquota to $snap_fs which will fail"
-log_mustnot $ZFS set userquota@$QUSER1=$SNAP_QUOTA $snap_fs
-log_mustnot $ZFS set groupquota@$QGROUP=$SNAP_QUOTA $snap_fs
+log_mustnot zfs set userquota@$QUSER1=$SNAP_QUOTA $snap_fs
+log_mustnot zfs set groupquota@$QGROUP=$SNAP_QUOTA $snap_fs
 
 log_note "change the parent's userquota and groupquota"
-log_must $ZFS set userquota@$QUSER1=$TEST_QUOTA $QFS
-log_must $ZFS set groupquota@$QGROUP=$TEST_QUOTA $QFS
+log_must zfs set userquota@$QUSER1=$TEST_QUOTA $QFS
+log_must zfs set groupquota@$QGROUP=$TEST_QUOTA $QFS
 
 log_must check_quota "userquota@$QUSER1" $QFS $TEST_QUOTA
 log_must check_quota "groupquota@$QGROUP" $QFS $TEST_QUOTA
 
 log_note "check the snapshot $snap_fs userquota and groupquota"