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/nestedfs/nestedfs_001_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/nestedfs/nestedfs_001_pos.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2007 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/include/libtest.shlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  # Given a pool create a nested file system and a ZFS file system
  37   37  # in the nested file system. Populate the file system.
  38   38  #
  39   39  # As a sub-assertion, the test verifies that a nested file system with
↓ open down ↓ 2 lines elided ↑ open up ↑
  42   42  # STRATEGY:
  43   43  # 1. Create a file in the new mountpoint
  44   44  # 2. Unmount the new mountpoint
  45   45  # 3. Show a nested file system with file systems cannot be destroyed
  46   46  #
  47   47  
  48   48  verify_runnable "both"
  49   49  
  50   50  log_assert "Verify a nested file system can be created/destroyed."
  51   51  
  52      -log_must $FILE_WRITE -o create -f $TESTDIR1/file -b 8192 -c 600 -d 0
  53      -log_must $ZFS unmount $TESTDIR1
       52 +log_must file_write -o create -f $TESTDIR1/file -b 8192 -c 600 -d 0
       53 +log_must zfs unmount $TESTDIR1
  54   54  
  55   55  log_note "Verify that a nested file system with a mounted file system "\
  56   56      "cannot be destroyed."
  57      -log_mustnot $ZFS destroy $TESTPOOL/$TESTCTR
       57 +log_mustnot zfs destroy $TESTPOOL/$TESTCTR
  58   58  
  59   59  log_pass "A nested file system was successfully populated."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX