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/userquota/userquota_006_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/userquota/userquota_006_pos.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  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 invalid parameter of zfs get user|group quota
  38   38  #
  39   39  #
  40   40  # STRATEGY:
  41   41  #       1. check the invalid zfs get user|group quota to fs
  42   42  #       2. check the valid zfs get user|group quota to snapshots
  43   43  #
  44   44  
  45   45  function cleanup
  46   46  {
  47   47          if datasetexists $snap_fs; then
  48      -                log_must $ZFS destroy $snap_fs
       48 +                log_must zfs destroy $snap_fs
  49   49          fi
  50   50  
  51   51          log_must cleanup_quota
  52   52  }
  53   53  
  54   54  log_onexit cleanup
  55   55  
  56   56  log_assert "Check the invalid parameter of zfs get user|group quota"
  57   57  typeset snap_fs=$QFS@snap
  58   58  
  59      -log_must $ZFS snapshot $snap_fs
       59 +log_must zfs snapshot $snap_fs
  60   60  
  61   61  set -A no_users "mms1234" "ss@#" "root-122" "1234"
  62   62  for user in "${no_users[@]}"; do
  63      -        log_mustnot eval "$ID $user >/dev/null 2>&1"
  64      -        log_must eval "$ZFS get userquota@$user $QFS >/dev/null 2>&1"
  65      -        log_must eval "$ZFS get userquota@$user $snap_fs >/dev/null 2>&1"
       63 +        log_mustnot eval "id $user >/dev/null 2>&1"
       64 +        log_must eval "zfs get userquota@$user $QFS >/dev/null 2>&1"
       65 +        log_must eval "zfs get userquota@$user $snap_fs >/dev/null 2>&1"
  66   66  done
  67   67  
  68   68  set -A no_groups "aidsf@dfsd@" "123223-dsfds#sdfsd" "mss_#ss" "1234"
  69   69  for group in "${no_groups[@]}"; do
  70      -        log_mustnot eval "$GROUPDEL $group > /dev/null 2>&1"
  71      -        log_must eval "$ZFS get groupquota@$group $QFS >/dev/null 2>&1"
  72      -        log_must eval "$ZFS get groupquota@$group $snap_fs >/dev/null 2>&1"
       70 +        log_mustnot eval "groupdel $group > /dev/null 2>&1"
       71 +        log_must eval "zfs get groupquota@$group $QFS >/dev/null 2>&1"
       72 +        log_must eval "zfs get groupquota@$group $snap_fs >/dev/null 2>&1"
  73   73  done
  74   74  
  75   75  log_pass "Check the invalid parameter of zfs get user|group quota pass as expect"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX