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/snapshot/snapshot_014_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_014_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 2007 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/snapshot/snapshot.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       verify that creating/destroying snapshots do things clean
  38   38  #
  39   39  # STRATEGY:
↓ open down ↓ 2 lines elided ↑ open up ↑
  42   42  #       3. take a snapshot and destroy it
  43   43  #       4. then create file to use all spaces in the dataset
  44   44  #       5. verify removing the first file should succeed
  45   45  #
  46   46  
  47   47  verify_runnable "both"
  48   48  
  49   49  function cleanup
  50   50  {
  51   51          [[ -e $TESTDIR1 ]] && \
  52      -                log_must $RM -rf $TESTDIR1/* > /dev/null 2>&1
       52 +                log_must rm -rf $TESTDIR1/* > /dev/null 2>&1
  53   53  
  54   54          snapexists $SNAPCTR && \
  55      -                log_must $ZFS destroy $SNAPCTR
       55 +                log_must zfs destroy $SNAPCTR
  56   56  
  57   57          datasetexists $TESTPOOL/$TESTCTR/$TESTFS1 && \
  58      -                log_must $ZFS set quota=none $TESTPOOL/$TESTCTR/$TESTFS1
       58 +                log_must zfs set quota=none $TESTPOOL/$TESTCTR/$TESTFS1
  59   59  
  60   60  }
  61   61  
  62   62  log_assert "Verify creating/destroying snapshots do things clean"
  63   63  log_onexit cleanup
  64   64  
  65      -log_must $ZFS set quota=$FSQUOTA $TESTPOOL/$TESTCTR/$TESTFS1
  66      -log_must $MKFILE $FILESIZE $TESTDIR1/$TESTFILE
       65 +log_must zfs set quota=$FSQUOTA $TESTPOOL/$TESTCTR/$TESTFS1
       66 +log_must mkfile $FILESIZE $TESTDIR1/$TESTFILE
  67   67  
  68      -log_must $ZFS snapshot $SNAPCTR
  69      -log_must $ZFS destroy $SNAPCTR
       68 +log_must zfs snapshot $SNAPCTR
       69 +log_must zfs destroy $SNAPCTR
  70   70  
  71   71  log_note "Make the quota of filesystem is reached"
  72      -log_mustnot $MKFILE $FILESIZE1 $TESTDIR1/$TESTFILE1
       72 +log_mustnot mkfile $FILESIZE1 $TESTDIR1/$TESTFILE1
  73   73  
  74   74  log_note "Verify removing the first file should succeed after the snapshot is \
  75   75          removed"
  76      -log_must $RM $TESTDIR1/$TESTFILE
       76 +log_must rm $TESTDIR1/$TESTFILE
  77   77  
  78   78  log_pass "Verify creating/destroying snapshots do things clean"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX