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 <behlendorf1@llnl.gov>
Signed-off-by: ChaoyuZhang <zhang.chaoyu@zte.com.cn>
Closes #5201 
Closes #5419
This commit is contained in:
ChaoyuZhang 2016-12-01 02:27:04 +08:00 committed by Brian Behlendorf
parent 2d44b04b79
commit ce43e88dd6
2 changed files with 4 additions and 2 deletions

View File

@ -169,7 +169,6 @@ tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos',
# DISABLED: # DISABLED:
# mountpoint_003_pos - needs investigation # mountpoint_003_pos - needs investigation
# ro_props_001_pos - https://github.com/zfsonlinux/zfs/issues/5201
[tests/functional/cli_root/zfs_set] [tests/functional/cli_root/zfs_set]
tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos', tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
'canmount_002_pos', 'canmount_003_pos', 'canmount_004_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', 'share_mount_001_neg', 'snapdir_001_pos', 'onoffs_001_pos',
'user_property_001_pos', 'user_property_003_neg', 'readonly_001_pos', 'user_property_001_pos', 'user_property_003_neg', 'readonly_001_pos',
'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg', '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 # DISABLED: Tests need to be updated for Linux share behavior
# zfs_share_005_pos - needs investigation, probably unsupported NFS share format # zfs_share_005_pos - needs investigation, probably unsupported NFS share format

View File

@ -72,6 +72,8 @@ log_onexit cleanup
# Create filesystem and volume's snapshot # Create filesystem and volume's snapshot
create_snapshot $TESTPOOL/$TESTFS $TESTSNAP create_snapshot $TESTPOOL/$TESTFS $TESTSNAP
create_snapshot $TESTPOOL/$TESTVOL $TESTSNAP create_snapshot $TESTPOOL/$TESTVOL $TESTSNAP
sync_pool $TESTPOOL
$SLEEP 5
typeset -i i=0 typeset -i i=0
typeset -i j=0 typeset -i j=0