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/snapshot/rollback_003_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh

   1    1  #! /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/cli_root/zfs_rollback/zfs_rollback_common.kshlib
  34   34  . $STF_SUITE/tests/functional/snapshot/snapshot.cfg
  35   35  
  36   36  
  37   37  #
  38   38  # DESCRIPTION:
  39   39  # Verify that rollbacks succeed when there are nested file systems.

  40   40  #
  41   41  # STRATEGY:
  42   42  # 1) Snapshot an empty file system and rollback
  43   43  # 2) Create a file in the file system
  44   44  # 3) Rollback the file system to empty
  45   45  # 4) Create a nested file system with the same name as the file created in (2)
  46   46  # 5) Verify a rollback succeeds

  47   47  #
  48   48  
  49   49  verify_runnable "both"
  50   50  
  51   51  function cleanup
  52   52  {
  53   53          typeset snap=""
  54   54          typeset fs=""
  55   55  
  56   56          export __ZFS_POOL_RESTRICT="$TESTPOOL"
  57      -        log_must $ZFS mount -a
       57 +        log_must zfs mount -a
  58   58          unset __ZFS_POOL_RESTRICT
  59   59  
  60   60          for snap in "$SNAPPOOL.1" "$SNAPPOOL"
  61   61          do
  62   62                  snapexists $snap
  63   63                  [[ $? -eq 0 ]] && \
  64      -                        log_must $ZFS destroy $snap
       64 +                        log_must zfs destroy $snap
  65   65          done
  66   66  
  67   67          for fs in "$TESTPOOL/$TESTFILE/$TESTFILE.1" "$TESTPOOL/$TESTFILE"
  68   68          do
  69   69                  datasetexists $fs
  70   70                  [[ $? -eq 0 ]] && \
  71      -                        log_must $ZFS destroy -r $fs
       71 +                        log_must zfs destroy -r $fs
  72   72          done
  73   73  
  74   74          [[ -e /$TESTPOOL ]] && \
  75      -                log_must $RM -rf $TESTPOOL/*
       75 +                log_must rm -rf $TESTPOOL/*
  76   76  }
  77   77  
  78   78  log_assert "Verify rollback succeeds when there are nested file systems."
  79   79  
  80   80  log_onexit cleanup
  81   81  
  82      -log_must $ZFS snapshot $SNAPPOOL
  83      -log_must $ZFS rollback $SNAPPOOL
  84      -log_mustnot $ZFS snapshot $SNAPPOOL
       82 +log_must zfs snapshot $SNAPPOOL
       83 +log_must zfs rollback $SNAPPOOL
       84 +log_mustnot zfs snapshot $SNAPPOOL
  85   85  
  86      -log_must $TOUCH /$TESTPOOL/$TESTFILE
       86 +log_must touch /$TESTPOOL/$TESTFILE
  87   87  
  88      -log_must $ZFS rollback $SNAPPOOL
  89      -log_must $ZFS create $TESTPOOL/$TESTFILE
       88 +log_must zfs rollback $SNAPPOOL
       89 +log_must zfs create $TESTPOOL/$TESTFILE
  90   90  
  91      -log_must $ZFS rollback $SNAPPOOL
       91 +log_must zfs rollback $SNAPPOOL
  92   92  
  93   93  log_note "Verify rollback of multiple nested file systems succeeds."
  94      -log_must $ZFS snapshot $TESTPOOL/$TESTFILE@$TESTSNAP
  95      -log_must $ZFS snapshot $SNAPPOOL.1
       94 +log_must zfs snapshot $TESTPOOL/$TESTFILE@$TESTSNAP
       95 +log_must zfs snapshot $SNAPPOOL.1
  96   96  
  97   97  export __ZFS_POOL_RESTRICT="$TESTPOOL"
  98      -log_must $ZFS unmount -a
  99      -log_must $ZFS mount -a
       98 +log_must zfs unmount -a
       99 +log_must zfs mount -a
 100  100  unset __ZFS_POOL_RESTRICT
 101  101  
 102      -log_must $TOUCH /$TESTPOOL/$TESTFILE/$TESTFILE.1
      102 +log_must touch /$TESTPOOL/$TESTFILE/$TESTFILE.1
 103  103  
 104      -log_must $ZFS rollback $SNAPPOOL.1
      104 +log_must zfs rollback $SNAPPOOL.1
 105  105  
 106  106  log_pass "Rollbacks succeed when nested file systems are present."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX