OpenZFS 7162 - Intermittent failures from ro_props_001_pos

Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
OpenZFS-issue: https://www.illumos.org/issues/7162
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/9ec0cbeb
Closes #5511
Closes #5779

diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index dfc2c5a66930facaa81446d288cfd11591000299..79ad242ea57b2803c51661bccc8220bdafe8daf2 100644 (file)
--- 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 1f3c0cf09c219b2050ef7ff6568cbce32ff59331..d22c757f4c65e241005eea7d91013ee6f8ab4dbd 100755 (executable)
--- 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 \