openstack
/
heat
Code Issues Proposed changes

Merge "Increase timeout of WaitCondition due to ConcurrentTransactions" into stable/mitaka

This commit is contained in:
Jenkins 2016-03-29 14:11:18 +00:00 committed by Gerrit Code Review
parent bd97025b65 db06ee4514
commit cdc2bfe2af
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat_integrationtests/functional/test_os_wait_condition.py
View File

@ -61,9 +61,9 @@ resources:
wc_notify --data-binary ''{"status": "SUCCESS", "id": "5"}''
# loop for 25 signals without reasons and data
# loop for 20 signals without reasons and data
for i in `seq 1 25`; do wc_notify --data-binary ''{"status":
for i in `seq 1 20`; do wc_notify --data-binary ''{"status":
"SUCCESS"}'' & done
wait
@ -76,7 +76,7 @@ resources:
type: OS::Heat::WaitCondition
depends_on: instance1
properties:
count: 30
count: 25
handle: {get_resource: wait_handle}
timeout: {get_param: timeout}
@ -102,5 +102,6 @@ outputs:
def test_create_stack_with_multi_signal_waitcondition(self):
params = {'flavor': self.conf.minimal_instance_type,
'image': self.conf.minimal_image_ref,
'network': self.conf.fixed_network_name}
'network': self.conf.fixed_network_name,
'timeout': 120}
self.stack_create(template=self.template, parameters=params)