diff options
| author | Matthew Ahrens <[email protected]> | 2016-07-19 16:10:27 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-13 11:26:45 -0800 |
| commit | a115cf35f8b4a85907e9879a18476e9b89b3c981 (patch) | |
| tree | 27efce077949a8630086f81557e96e622f394891 | |
| parent | 544596c59e49b25584c58007d04b94097e8a8292 (diff) | |
OpenZFS 7162 - Intermittent failures from ro_props_001_pos
Reviewed by: John Kennedy <[email protected]>
Reviewed by: Dan Kimmel <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Ported-by: Brian Behlendorf <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7162
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/9ec0cbeb
Closes #5511
Closes #5779
| -rw-r--r-- | tests/runfiles/linux.run | 4 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index dfc2c5a66..79ad242ea 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -174,8 +174,6 @@ tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos', 'zfs_send_004_neg', 'zfs_send_005_pos', 'zfs_send_006_pos', 'zfs_send_007_pos'] -# DISABLED: -# ro_props_001_pos - https://github.com/zfsonlinux/zfs/issues/5511 [tests/functional/cli_root/zfs_set] tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos', 'canmount_002_pos', 'canmount_003_pos', 'canmount_004_pos', @@ -185,7 +183,7 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos', 'user_property_001_pos', 'user_property_003_neg', 'readonly_001_pos', 'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg', 'zfs_set_002_neg', 'zfs_set_003_neg', 'property_alias_001_pos', - 'mountpoint_003_pos'] + 'mountpoint_003_pos', 'ro_props_001_pos'] # DISABLED: # zfs_share_005_pos - needs investigation, probably unsupported NFS share format diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh index 1f3c0cf09..d22c757f4 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh @@ -24,6 +24,8 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2016 by Delphix. All rights reserved. +# . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib @@ -31,6 +33,8 @@ # # DESCRIPTION: # Verify that read-only properties are immutable. +# Note that we can only check properties that have no possibility of +# changing while we are running (which excludes e.g. "available"). # # STRATEGY: # 1. Create pool, fs, vol, fs@snap & vol@snap. @@ -44,10 +48,10 @@ verify_runnable "both" set -A values filesystem volume snapshot -3 0 1 50K 10G 80G \ 2005/06/17 30K 20x yes no \ on off default pool/fs@snap $TESTDIR -set -A dataset $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \ +set -A dataset $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \ $TESTPOOL/$TESTCTR/$TESTFS1 $TESTPOOL/$TESTFS@$TESTSNAP \ $TESTPOOL/$TESTVOL@$TESTSNAP -typeset ro_props="type used available avail creation referenced refer compressratio \ +typeset ro_props="type used creation referenced refer compressratio \ mounted origin" typeset snap_ro_props="volsize recordsize recsize quota reservation reserv mountpoint \ sharenfs checksum compression compress atime devices exec readonly rdonly \ |