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/snapshot_012_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_012_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 2008 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 'snapshot -r' can create snapshot for promoted clone, and vice
  38   38  #       versa, a clone filesystem from the snapshot created by 'snapshot -r'
  39   39  #       can be correctly promoted.

  40   40  #
  41   41  # STRATEGY:
  42   42  #       1. Create a dataset tree
  43   43  #       2. snapshot a filesystem and clone the snapshot
  44   44  #       3. promote the clone
  45   45  #       4. snapshot -r the dataset tree
  46   46  #       5. verify that the snapshot of cloned filesystem is created correctly

  47   47  #       6. clone a snapshot from the snapshot tree
  48   48  #       7. promote the clone
  49   49  #       8. verify that the clone is promoted correctly.
  50   50  #
  51   51  
  52   52  verify_runnable "both"
  53   53  
  54   54  function cleanup
  55   55  {
  56   56          if datasetexists $clone1; then
  57      -                log_must $ZFS promote $ctrfs
  58      -                log_must $ZFS destroy $clone1
       57 +                log_must zfs promote $ctrfs
       58 +                log_must zfs destroy $clone1
  59   59          fi
  60   60  
  61   61          snapexists $snapctr && \
  62      -                log_must $ZFS destroy -r $snapctr
       62 +                log_must zfs destroy -r $snapctr
  63   63  
  64   64          if snapexists $clone@$TESTSNAP1; then
  65      -                log_must $ZFS promote $ctrfs
  66      -                log_must $ZFS destroy -rR $ctrfs@$TESTSNAP1
       65 +                log_must zfs promote $ctrfs
       66 +                log_must zfs destroy -rR $ctrfs@$TESTSNAP1
  67   67          fi
  68   68  }
  69   69  
  70   70  log_assert "Verify that 'snapshot -r' can work with 'zfs promote'."
  71   71  log_onexit cleanup
  72   72  
  73   73  ctr=$TESTPOOL/$TESTCTR
  74   74  ctrfs=$ctr/$TESTFS1
  75   75  clone=$ctr/$TESTCLONE
  76   76  clone1=$ctr/$TESTCLONE1
  77   77  snappool=$SNAPPOOL
  78   78  snapfs=$SNAPFS
  79   79  snapctr=$ctr@$TESTSNAP
  80   80  snapctrclone=$clone@$TESTSNAP
  81   81  snapctrclone1=$clone1@$TESTSNAP
  82   82  snapctrfs=$SNAPCTR
  83   83  
  84   84  #preparation for testing
  85      -log_must $ZFS snapshot $ctrfs@$TESTSNAP1
  86      -log_must $ZFS clone $ctrfs@$TESTSNAP1 $clone
  87      -log_must $ZFS promote $clone
       85 +log_must zfs snapshot $ctrfs@$TESTSNAP1
       86 +log_must zfs clone $ctrfs@$TESTSNAP1 $clone
       87 +log_must zfs promote $clone
  88   88  
  89      -log_must $ZFS snapshot -r $snapctr
       89 +log_must zfs snapshot -r $snapctr
  90   90  
  91   91  ! snapexists $snapctrclone && \
  92   92          log_fail "'snapshot -r' fails to create $snapctrclone for $ctr/$TESTCLONE."
  93   93  
  94      -log_must $ZFS clone $snapctrfs $clone1
  95      -log_must $ZFS promote $clone1
       94 +log_must zfs clone $snapctrfs $clone1
       95 +log_must zfs promote $clone1
  96   96  
  97   97  #verify the origin value is correct.
  98   98  orig_value=$(get_prop origin $ctrfs)
  99   99  if ! snapexists $snapctrclone1 || [[ "$orig_value" != "$snapctrclone1" ]]; then
 100  100          log_fail "'zfs promote' fails to promote $clone which is cloned from \
 101  101                  $snapctrfs."
 102  102  fi
 103  103  
 104  104  log_pass "'snapshot -r' can work with 'zfs promote' as expected."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX