Print this page
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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/cache/cache_004_neg.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/cache/cache_004_neg.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  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/tests/functional/cache/cache.cfg
  33   33  . $STF_SUITE/tests/functional/cache/cache.kshlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       Attaching a cache device fails.
  38   38  #
  39   39  # STRATEGY:
↓ open down ↓ 3 lines elided ↑ open up ↑
  43   43  #
  44   44  
  45   45  verify_runnable "global"
  46   46  verify_disk_count "$LDEV2"
  47   47  
  48   48  log_assert "Attaching a cache device fails for an existing cache device."
  49   49  log_onexit cleanup
  50   50  
  51   51  for type in "" "mirror" "raidz" "raidz2"
  52   52  do
  53      -        log_must $ZPOOL create $TESTPOOL $type $VDEV \
       53 +        log_must zpool create $TESTPOOL $type $VDEV \
  54   54                  cache $LDEV
  55   55  
  56   56          ldev=$(random_get $LDEV)
  57   57          typeset ldev2=$(random_get $LDEV2)
  58      -        log_mustnot $ZPOOL attach $TESTPOOL $ldev $ldev2
       58 +        log_mustnot zpool attach $TESTPOOL $ldev $ldev2
  59   59          log_must check_vdev_state $TESTPOOL $ldev2 ""
  60   60  
  61      -        log_must $ZPOOL destroy -f $TESTPOOL
       61 +        log_must zpool destroy -f $TESTPOOL
  62   62  done
  63   63  
  64   64  log_pass "Attaching a cache device fails for an existing cache device."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX