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>

          --- old/usr/src/test/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh

   1    1  #!/usr/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]

  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2009 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/userquota/userquota_common.kshlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       Check the user used size and quota in zfs userspace
  38   38  #
  39   39  #
  40   40  # STRATEGY:
  41   41  #       1. set zfs userquota to a fs
  42   42  #       2. write some data to the fs with specified user and size
  43   43  #       3. use zfs userspace to check the used size and quota size
  44   44  #
  45   45  
  46   46  function cleanup
  47   47  {
  48   48          if datasetexists $snapfs; then
  49      -                log_must $ZFS destroy $snapfs
       49 +                log_must zfs destroy $snapfs
  50   50          fi
  51   51  
  52   52          log_must cleanup_quota
  53   53  }
  54   54  
  55   55  log_onexit cleanup
  56   56  
  57   57  log_assert "Check the zfs userspace used and quota"
  58   58  
  59      -log_must $ZFS set userquota@$QUSER1=100m $QFS
       59 +log_must zfs set userquota@$QUSER1=100m $QFS
  60   60  
  61   61  mkmount_writable $QFS
  62   62  
  63      -log_must user_run $QUSER1 $MKFILE 50m $QFILE
  64      -$SYNC
       63 +log_must user_run $QUSER1 mkfile 50m $QFILE
       64 +sync
  65   65  
  66   66  typeset snapfs=$QFS@snap
  67   67  
  68      -log_must $ZFS snapshot $snapfs
       68 +log_must zfs snapshot $snapfs
  69   69  
  70      -log_must eval "$ZFS userspace $QFS >/dev/null 2>&1"
  71      -log_must eval "$ZFS userspace $snapfs >/dev/null 2>&1"
       70 +log_must eval "zfs userspace $QFS >/dev/null 2>&1"
       71 +log_must eval "zfs userspace $snapfs >/dev/null 2>&1"
  72   72  
  73   73  for fs in "$QFS" "$snapfs"; do
  74   74          log_note "check the quota size in zfs userspace $fs"
  75      -        log_must eval "$ZFS userspace $fs | $GREP $QUSER1 | $GREP 100M"
       75 +        log_must eval "zfs userspace $fs | grep $QUSER1 | grep 100M"
  76   76  
  77   77          log_note "check the user used size in zfs userspace $fs"
  78      -        log_must eval "$ZFS userspace $fs | $GREP $QUSER1 | $GREP 50.0M"
       78 +        log_must eval "zfs userspace $fs | grep $QUSER1 | grep 50.0M"
  79   79  done
  80   80  
  81   81  log_pass "Check the zfs userspace used and quota"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX