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 2007 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  . $STF_SUITE/tests/functional/redundancy/redundancy.kshlib
  
  #
--- 24,34 ----
  # Copyright 2007 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/redundancy/redundancy.kshlib
  
  #
*** 52,62 ****
  
  typeset -i cnt=$(random 2 5)
  setup_test_env $TESTPOOL "" $cnt
  
  damage_devs $TESTPOOL 1 "keep_label"
! log_must $ZPOOL clear $TESTPOOL
  
  # Wait for the scrub intiated by the clear to wrap, or is_healthy will be wrong.
  while ! is_pool_scrubbed $TESTPOOL; do
          sync
  done
--- 52,62 ----
  
  typeset -i cnt=$(random 2 5)
  setup_test_env $TESTPOOL "" $cnt
  
  damage_devs $TESTPOOL 1 "keep_label"
! log_must zpool clear $TESTPOOL
  
  # Wait for the scrub intiated by the clear to wrap, or is_healthy will be wrong.
  while ! is_pool_scrubbed $TESTPOOL; do
          sync
  done