Print this page
NEX-3974 Remove timing issues so the robot can run consistently
Reviewed by: Steve Peng <steve.peng@nexenta.com>
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
NEX-3231 ZFS bootfs tests need some work (cleanup vdev file)
NEX-3131 ZFS bootfs tests need some work
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
↓ open down ↓ 16 lines elided ↑ open up ↑
  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 2009 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27      -# Copyright 2015 Nexenta Systems, Inc.
  28      -#
  29   27  
  30   28  #
  31   29  # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
       30 +# Copyright 2015 Nexenta Systems, Inc.
  32   31  #
  33   32  
  34      -#
  35      -# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
  36      -#
  37      -
  38   33  . $STF_SUITE/include/libtest.shlib
  39   34  
  40   35  #
  41   36  # DESCRIPTION:
  42   37  #
  43   38  # Invalid datasets are rejected as boot property values
  44   39  #
  45   40  # STRATEGY:
  46   41  #
  47      -# 1. Create a zvol 
       42 +# 1. Create a zvol
  48   43  # 2. Verify that we can't set the bootfs to that dataset
  49   44  #
  50   45  
  51   46  verify_runnable "global"
  52   47  
  53   48  function cleanup {
  54   49          if datasetexists $TESTPOOL/vol
  55   50          then
  56   51                  log_must zfs destroy $TESTPOOL/vol
  57   52          fi
  58   53          if poolexists $TESTPOOL
  59   54          then
  60      -                log_must zpool destroy $TESTPOOL
       55 +                log_must destroy_pool_no_force $TESTPOOL
  61   56          fi
  62   57          if [[ -f $VDEV ]]; then
  63   58                  log_must rm -f $VDEV
  64   59          fi
  65   60  }
  66   61  
  67   62  
  68   63  zpool set 2>&1 | grep bootfs > /dev/null
  69   64  if [ $? -ne 0 ]
  70   65  then
↓ open down ↓ 15 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX