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 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/rsend/rsend.kshlib
  
  #
--- 24,34 ----
  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/rsend/rsend.kshlib
  
  #
*** 58,95 ****
          typeset -i i=0
          while ((i < ${#dtst[@]})); do
                  origin=$(get_prop origin ${dtst[$i]})
  
                  if [[ $origin != "-" ]]; then
!                         log_must $ZFS promote ${dtst[$i]}
                  fi
  
                  ((i += 2))
          done
  
          origin=$(get_prop origin $POOL2)
          if [[ $origin != "-" ]]; then
!                 log_must $ZFS promote $POOL2
          fi
          log_must cleanup_pool $POOL2
  }
  
  log_assert "Changes made by 'zfs promote' can be properly received."
  log_onexit cleanup
  
  typeset -i i=0
  while ((i < ${#dtst[@]})); do
!         log_must $ZFS promote ${dtst[((i+1))]}
  
          ((i += 2))
  done
  
  #
  # Verify zfs send -R should succeed
  #
! log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
! log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
  
  dstds=$(get_dst_ds $POOL $POOL2)
  #
  # Define all the POOL/POOL2 datasets pair
  #
--- 58,95 ----
          typeset -i i=0
          while ((i < ${#dtst[@]})); do
                  origin=$(get_prop origin ${dtst[$i]})
  
                  if [[ $origin != "-" ]]; then
!                         log_must zfs promote ${dtst[$i]}
                  fi
  
                  ((i += 2))
          done
  
          origin=$(get_prop origin $POOL2)
          if [[ $origin != "-" ]]; then
!                 log_must zfs promote $POOL2
          fi
          log_must cleanup_pool $POOL2
  }
  
  log_assert "Changes made by 'zfs promote' can be properly received."
  log_onexit cleanup
  
  typeset -i i=0
  while ((i < ${#dtst[@]})); do
!         log_must zfs promote ${dtst[((i+1))]}
  
          ((i += 2))
  done
  
  #
  # Verify zfs send -R should succeed
  #
! log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
! log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
  
  dstds=$(get_dst_ds $POOL $POOL2)
  #
  # Define all the POOL/POOL2 datasets pair
  #
*** 117,128 ****
  
          ((i += 2))
  done
  
  # Verify the original filesystem can be promoted
! log_must $ZFS promote $dstds
  if is_global_zone ; then
!         log_must $ZFS promote $dstds/$FS/vol
  fi
! log_must $ZFS promote $dstds/$FS/fs1/fs2
  
  log_pass "Changes made by 'zfs promote' can be properly received."
--- 117,128 ----
  
          ((i += 2))
  done
  
  # Verify the original filesystem can be promoted
! log_must zfs promote $dstds
  if is_global_zone ; then
!         log_must zfs promote $dstds/$FS/vol
  fi
! log_must zfs promote $dstds/$FS/fs1/fs2
  
  log_pass "Changes made by 'zfs promote' can be properly received."