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/inuse/inuse_004_pos.ksh
+++ new/usr/src/test/zfs-tests/tests/functional/inuse/inuse_004_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]
|
↓ 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/include/libtest.shlib
33 33 . $STF_SUITE/tests/functional/inuse/inuse.cfg
34 34
35 35 #
36 36 # DESCRIPTION:
37 37 # format will disallow modification of a mounted zfs disk partition or a spare
38 38 # device
39 39 #
40 40 # STRATEGY:
41 41 # 1. Create a ZFS filesystem
42 42 # 2. Add a spare device to the ZFS pool
43 43 # 3. Attempt to format the disk and the spare device.
44 44 #
|
↓ open down ↓ |
5 lines elided |
↑ open up ↑ |
45 45
46 46 verify_runnable "global"
47 47
48 48 function cleanup
49 49 {
50 50 #
51 51 # Essentailly this is the default_cleanup rountine but I cannot get it
52 52 # to work correctly. So its reproduced below. Still need to full
53 53 # understand why default_cleanup does not work correctly from here.
54 54 #
55 - log_must $ZFS umount $TESTPOOL/$TESTFS
55 + log_must zfs umount $TESTPOOL/$TESTFS
56 56
57 - $RM -rf $TESTDIR || \
57 + rm -rf $TESTDIR || \
58 58 log_unresolved Could not remove $TESTDIR
59 59
60 - log_must $ZFS destroy $TESTPOOL/$TESTFS
60 + log_must zfs destroy $TESTPOOL/$TESTFS
61 61 destroy_pool $TESTPOOL
62 62 }
63 63 #
64 64 # Currently, if a ZFS disk gets formatted things go horribly wrong, hence the
65 65 # mini_format function. If the modify option is reached, then we know format
66 66 # would happily continue - best to not go further.
67 67 #
68 68 function mini_format
69 69 {
70 70 typeset disk=$1
71 71
72 72 typeset format_file=/var/tmp/format_in.$$.1
73 - $ECHO "partition" > $format_file
74 - $ECHO "modify" >> $format_file
73 + echo "partition" > $format_file
74 + echo "modify" >> $format_file
75 75
76 - $FORMAT -e -s -d $disk -f $format_file
76 + format -e -s -d $disk -f $format_file
77 77 typeset -i retval=$?
78 - $RM -rf $format_file
78 + rm -rf $format_file
79 79 return $retval
80 80 }
81 81
82 82 log_assert "format will disallow modification of a mounted zfs disk partition"\
83 83 " or a spare device"
84 84
85 85 log_onexit cleanup
86 86 log_must default_setup_noexit $FS_DISK0
87 -log_must $ZPOOL add $TESTPOOL spare $FS_DISK1
87 +log_must zpool add $TESTPOOL spare $FS_DISK1
88 88
89 89 log_note "Attempt to format a ZFS disk"
90 90 log_mustnot mini_format $FS_DISK0
91 91 log_note "Attempt to format a ZFS spare device"
92 92 log_mustnot mini_format $FS_DISK1
93 93
94 94 log_pass "Unable to format a disk in use by ZFS"
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX