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_010_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/userquota/userquota_010_pos.ksh
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  #
  23   23  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  
  27   27  #
  28      -# Copyright (c) 2013 by Delphix. All rights reserved.
       28 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  29   29  #
  30   30  
  31   31  . $STF_SUITE/include/libtest.shlib
  32   32  . $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  #       Check userquota and groupquota be overwrited at same time
  37   37  #
  38   38  #
↓ open down ↓ 6 lines elided ↑ open up ↑
  45   45  function cleanup
  46   46  {
  47   47          cleanup_quota
  48   48  }
  49   49  
  50   50  log_onexit cleanup
  51   51  
  52   52  log_assert "overwrite any of the {user|group}quota size, it will fail"
  53   53  
  54   54  log_note "overwrite to $QFS to make it exceed userquota"
  55      -log_must $ZFS set userquota@$QUSER1=$UQUOTA_SIZE $QFS
  56      -log_must $ZFS set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
       55 +log_must zfs set userquota@$QUSER1=$UQUOTA_SIZE $QFS
       56 +log_must zfs set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
  57   57  
  58   58  mkmount_writable $QFS
  59      -log_must user_run $QUSER1 $MKFILE $UQUOTA_SIZE $QFILE
  60      -$SYNC
       59 +log_must user_run $QUSER1 mkfile $UQUOTA_SIZE $QFILE
       60 +sync
  61   61  
  62      -log_must eval "$ZFS get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
  63      -log_must eval "$ZFS get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
       62 +log_must eval "zfs get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
       63 +log_must eval "zfs get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
  64   64  
  65      -log_mustnot user_run $QUSER1 $MKFILE 1 $OFILE
       65 +log_mustnot user_run $QUSER1 mkfile 1 $OFILE
  66   66  
  67      -log_must $RM -f $QFILE
       67 +log_must rm -f $QFILE
  68   68  
  69   69  log_note "overwrite to $QFS to make it exceed userquota"
  70      -log_mustnot user_run $QUSER1 $MKFILE $GQUOTA_SIZE $QFILE
       70 +log_mustnot user_run $QUSER1 mkfile $GQUOTA_SIZE $QFILE
  71   71  
  72      -log_must eval "$ZFS get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
  73      -log_must eval "$ZFS get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
       72 +log_must eval "zfs get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
       73 +log_must eval "zfs get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
  74   74  
  75   75  log_pass "overwrite any of the {user|group}quota size, it fail as expect"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX