Print this page
NEX-3974 Remove timing issues so the robot can run consistently
Reviewed by: Steve Peng <steve.peng@nexenta.com>
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
4206 history_003_pos relies on exact size of history log and entries
4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
Reviewed by: Sonu Pillai <sonu.pillai@delphix.com>
Reviewed by: Will Guyette <will.guyette@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/userquota/userquota_002_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/userquota/userquota_002_pos.ksh
↓ open down ↓ 19 lines elided ↑ open up ↑
  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   29  # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
       30 +# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
  30   31  #
  31   32  
  32   33  . $STF_SUITE/include/libtest.shlib
  33   34  . $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
  34   35  
  35   36  #
  36   37  # DESCRIPTION:
  37   38  #       the userquota and groupquota can be set during zpool or zfs creation"
  38   39  #
  39   40  #
  40   41  # STRATEGY:
  41   42  #       1. Set userquota and groupquota via "zpool -O or zfs create -o"
  42   43  #
  43   44  
  44   45  verify_runnable "global"
  45   46  
  46   47  function cleanup
  47   48  {
  48   49          if poolexists $TESTPOOL1; then
  49      -                log_must zpool destroy $TESTPOOL1
       50 +                log_must destroy_pool_no_force $TESTPOOL1
  50   51          fi
  51   52  
  52   53          if [[ -f $pool_vdev ]]; then
  53   54                  rm -f $pool_vdev
  54   55          fi
  55   56  }
  56   57  
  57   58  log_onexit cleanup
  58   59  
  59   60  log_assert \
  60   61          "the userquota and groupquota can be set during zpool,zfs creation"
  61   62  
  62   63  typeset pool_vdev=/var/tmp/pool_dev.$$
  63   64  
  64   65  log_must mkfile 500m $pool_vdev
  65   66  
  66   67  if poolexists $TESTPOOL1; then
  67      -        zpool destroy $TESTPOOL1
       68 +        destroy_pool_no_force $TESTPOOL1
  68   69  fi
  69   70  
  70   71  log_must zpool create -O userquota@$QUSER1=$UQUOTA_SIZE \
  71   72          -O groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1 $pool_vdev
  72   73  
  73   74  log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
  74   75          $TESTPOOL1 > /dev/null 2>&1"
  75   76  
  76   77  log_must check_quota "userquota@$QUSER1" $TESTPOOL1 "$UQUOTA_SIZE"
  77   78  log_must check_quota "groupquota@$QGROUP" $TESTPOOL1 "$GQUOTA_SIZE"
↓ open down ↓ 12 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX