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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_003_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_003_pos.ksh
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29   29  # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
       30 +# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  30   31  #
  31   32  
  32   33  . $STF_SUITE/include/libtest.shlib
  33   34  
  34   35  #
  35   36  # DESCRIPTION:
  36   37  #
  37   38  # Valid pool names are accepted
  38   39  #
  39   40  # STRATEGY:
↓ open down ↓ 1 lines elided ↑ open up ↑
  41   42  # 2. Create a filesystem in that pool
  42   43  # 2. Verify we can set the bootfs to that filesystem
  43   44  #
  44   45  
  45   46  verify_runnable "global"
  46   47  
  47   48  set -A pools "pool.$$" "pool123" "mypool"
  48   49  
  49   50  function cleanup {
  50   51          if poolexists $POOL ; then
  51      -                log_must zpool destroy $POOL
       52 +                log_must destroy_pool_no_force $POOL
  52   53          fi
  53   54          rm /bootfs_003.$$.dat
  54   55  }
  55   56  
  56   57  
  57   58  zpool set 2>&1 | grep bootfs > /dev/null
  58   59  if [ $? -ne 0 ]
  59   60  then
  60   61          log_unsupported "bootfs pool property not supported on this release."
  61   62  fi
↓ open down ↓ 10 lines elided ↑ open up ↑
  72   73          POOL=${pools[$i]}
  73   74          log_must zpool create $POOL /bootfs_003.$$.dat
  74   75          log_must zfs create $POOL/$TESTFS
  75   76  
  76   77          log_must zpool set bootfs=$POOL/$TESTFS $POOL
  77   78          RES=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
  78   79          if [ $RES != "$POOL/$TESTFS" ]
  79   80          then
  80   81                  log_fail "Expected $RES == $POOL/$TESTFS"
  81   82          fi
  82      -        log_must zpool destroy $POOL
       83 +        log_must destroy_pool_no_force $POOL
  83   84          i=$(( $i + 1 ))
  84   85  done
  85   86  
  86   87  log_pass "Valid pool names are accepted by zpool set bootfs"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX