diff options
| author | ChaoyuZhang <[email protected]> | 2016-12-01 02:27:04 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-11-30 11:27:04 -0700 |
| commit | ce43e88dd65509a4cf62c4acc76619e571d8518a (patch) | |
| tree | df8ddcde2ff06b36ba5bce710ee5098132af2820 /tests | |
| parent | 2d44b04b79317df32b509a381d023ba2d5b80f39 (diff) | |
Enable ro_props_001_pos
This script was disabled as the avail/used space changed slightly.
Add sync_pool() and a short delay after snapshots are created to
ensure everything in flight has been written.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: ChaoyuZhang <[email protected]>
Closes #5201
Closes #5419
Diffstat (limited to 'tests')
| -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 | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index d3c090b89..0b29787ae 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -169,7 +169,6 @@ tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos', # DISABLED: # mountpoint_003_pos - needs investigation -# ro_props_001_pos - https://github.com/zfsonlinux/zfs/issues/5201 [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', @@ -178,7 +177,8 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos', 'share_mount_001_neg', 'snapdir_001_pos', 'onoffs_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'] + 'zfs_set_002_neg', 'zfs_set_003_neg', 'property_alias_001_pos', + 'ro_props_001_pos'] # DISABLED: Tests need to be updated for Linux share behavior # 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 c9a739109..1f3c0cf09 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 @@ -72,6 +72,8 @@ log_onexit cleanup # Create filesystem and volume's snapshot create_snapshot $TESTPOOL/$TESTFS $TESTSNAP create_snapshot $TESTPOOL/$TESTVOL $TESTSNAP +sync_pool $TESTPOOL +$SLEEP 5 typeset -i i=0 typeset -i j=0 |