openstack/heat
Code Issues Proposed changes

Bring back signal-related tests

Browse Source 
Reverts I90e1d26a67a349f897d895f750d8e57fae98ec1f and
I116a96b20082d1c47068ddc64873200e9ae33a27 .

There have been a few changes that should enable these tests to
succeed on a regular basis, all related to edge cases around updating
a resource's atomic_key and metadata:

Corrected max secs for concurrent trans retries
e37d9fab8fe2e779ae8c0e2311de2601b66c66b6

Don't set metadata for deleted resources
8d7e3e41e8f02726dca33b5ec2f6d5b6b6b07a31

Allow retries when resource acquires lock
2ec2d5a973927f9a2cc2a62f70712afc5cb30f4c

Change-Id: I0fe508cf102bc1041a16c5ce1d9e384ecd591173
This commit is contained in:
Crag Wolfe 2017-05-04 18:16:34 -04:00
parent e37d9fab8f
commit e50ce9c6e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat_integrationtests/functional/test_os_wait_condition.py
View File

@ -76,7 +76,7 @@ resources:
type: OS::Heat::WaitCondition type: OS::Heat::WaitCondition
depends_on: instance1 depends_on: instance1
properties: properties:
count: 12 count: 25
handle: {get_resource: wait_handle} handle: {get_resource: wait_handle}
timeout: {get_param: timeout} timeout: {get_param: timeout}

2
heat_integrationtests/prepare_test_env.sh
View File

@ -70,6 +70,6 @@ iniset $conf_file heat_plugin skip_functional_test_list 'CancelUpdateTest.test_c
# Add scenario tests to skip # Add scenario tests to skip
# VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300 # VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300
# test_server_signal_userdata_format_software_config is skipped untill bug #1651768 is resolved # test_server_signal_userdata_format_software_config is skipped untill bug #1651768 is resolved
iniset $conf_file heat_plugin skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest, ServerSignalIntegrationTest.test_server_signal_userdata_format_software_config' iniset $conf_file heat_plugin skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest'
cat $conf_file cat $conf_file