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-3131 ZFS bootfs tests need some work
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

          --- old/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_001_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_001_pos.ksh

   1    1  #!/usr/bin/ksh -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the

  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  # Valid datasets and snapshots are accepted as bootfs property values
  44   39  #
  45   40  # STRATEGY:
  46   41  # 1. Create a set of datasets and snapshots in a test pool
  47   42  # 2. Try setting them as boot filesystems
  48   43  #
  49   44  
  50   45  verify_runnable "global"
  51   46  
  52   47  function cleanup {
  53   48          if poolexists $TESTPOOL ; then
  54      -                log_must zpool destroy $TESTPOOL
       49 +                log_must destroy_pool_no_force $TESTPOOL
  55   50          fi
  56   51  
  57   52          if [[ -f $VDEV ]]; then
  58   53                  log_must rm -f $VDEV
  59   54          fi
  60   55  }
  61   56  
  62   57  zpool set 2>&1 | grep bootfs > /dev/null
  63   58  if [ $? -ne 0 ]
  64   59  then

  65   60          log_unsupported "bootfs pool property not supported on this release."
  66   61  fi
  67   62  
  68   63  log_assert "Valid datasets are accepted as bootfs property values"
  69   64  log_onexit cleanup
  70   65  
  71   66  typeset VDEV=/bootfs_001_pos_a.$$.dat
  72   67  
  73   68  log_must mkfile $MINVDEVSIZE $VDEV
  74   69  create_pool "$TESTPOOL" "$VDEV"
  75   70  log_must zfs create $TESTPOOL/$TESTFS
  76   71  
  77   72  log_must zfs snapshot $TESTPOOL/$TESTFS@snap
  78   73  log_must zfs clone $TESTPOOL/$TESTFS@snap $TESTPOOL/clone
  79   74  
  80   75  log_must zpool set bootfs=$TESTPOOL/$TESTFS $TESTPOOL
  81   76  log_must zpool set bootfs=$TESTPOOL/$TESTFS@snap $TESTPOOL
  82   77  log_must zpool set bootfs=$TESTPOOL/clone $TESTPOOL
  83   78  
  84   79  log_must zfs promote $TESTPOOL/clone
  85   80  log_must zpool set bootfs=$TESTPOOL/clone $TESTPOOL
  86   81  log_pass "Valid datasets are accepted as bootfs property values"

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX