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>

*** 24,34 ****
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/snapshot/snapshot.cfg
  
--- 24,34 ----
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/include/libtest.shlib
  . $STF_SUITE/tests/functional/snapshot/snapshot.cfg
  
*** 52,71 ****
  verify_runnable "both"
  
  function cleanup
  {
          if datasetexists $clone1; then
!                 log_must $ZFS promote $ctrfs
!                 log_must $ZFS destroy $clone1
          fi
  
          snapexists $snapctr && \
!                 log_must $ZFS destroy -r $snapctr
  
          if snapexists $clone@$TESTSNAP1; then
!                 log_must $ZFS promote $ctrfs
!                 log_must $ZFS destroy -rR $ctrfs@$TESTSNAP1
          fi
  }
  
  log_assert "Verify that 'snapshot -r' can work with 'zfs promote'."
  log_onexit cleanup
--- 52,71 ----
  verify_runnable "both"
  
  function cleanup
  {
          if datasetexists $clone1; then
!                 log_must zfs promote $ctrfs
!                 log_must zfs destroy $clone1
          fi
  
          snapexists $snapctr && \
!                 log_must zfs destroy -r $snapctr
  
          if snapexists $clone@$TESTSNAP1; then
!                 log_must zfs promote $ctrfs
!                 log_must zfs destroy -rR $ctrfs@$TESTSNAP1
          fi
  }
  
  log_assert "Verify that 'snapshot -r' can work with 'zfs promote'."
  log_onexit cleanup
*** 80,100 ****
  snapctrclone=$clone@$TESTSNAP
  snapctrclone1=$clone1@$TESTSNAP
  snapctrfs=$SNAPCTR
  
  #preparation for testing
! log_must $ZFS snapshot $ctrfs@$TESTSNAP1
! log_must $ZFS clone $ctrfs@$TESTSNAP1 $clone
! log_must $ZFS promote $clone
  
! log_must $ZFS snapshot -r $snapctr
  
  ! snapexists $snapctrclone && \
          log_fail "'snapshot -r' fails to create $snapctrclone for $ctr/$TESTCLONE."
  
! log_must $ZFS clone $snapctrfs $clone1
! log_must $ZFS promote $clone1
  
  #verify the origin value is correct.
  orig_value=$(get_prop origin $ctrfs)
  if ! snapexists $snapctrclone1 || [[ "$orig_value" != "$snapctrclone1" ]]; then
          log_fail "'zfs promote' fails to promote $clone which is cloned from \
--- 80,100 ----
  snapctrclone=$clone@$TESTSNAP
  snapctrclone1=$clone1@$TESTSNAP
  snapctrfs=$SNAPCTR
  
  #preparation for testing
! log_must zfs snapshot $ctrfs@$TESTSNAP1
! log_must zfs clone $ctrfs@$TESTSNAP1 $clone
! log_must zfs promote $clone
  
! log_must zfs snapshot -r $snapctr
  
  ! snapexists $snapctrclone && \
          log_fail "'snapshot -r' fails to create $snapctrclone for $ctr/$TESTCLONE."
  
! log_must zfs clone $snapctrfs $clone1
! log_must zfs promote $clone1
  
  #verify the origin value is correct.
  orig_value=$(get_prop origin $ctrfs)
  if ! snapexists $snapctrclone1 || [[ "$orig_value" != "$snapctrclone1" ]]; then
          log_fail "'zfs promote' fails to promote $clone which is cloned from \