openstack/heat
Code Issues Proposed changes

Merge "Bring back signal-related tests"

Browse Source
This commit is contained in:
Jenkins 2017-05-15 06:08:46 +00:00 committed by Gerrit Code Review
commit ccd6239c0d
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