diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-29 14:11:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-29 14:11:18 +0000 |
| commit | cdc2bfe2af2a2b57c2f902edd41032516b2608fb (patch) | |
| tree | 11eeca88da5632135347e7f9f947662a57d4a04b | |
| parent | bd97025b65870a47cdf2db11a8e02887f335b5b5 (diff) | |
| parent | db06ee4514b0cc8037f037788c34631c272cfc6b (diff) | |
| download | heat-6.0.0.0rc2.tar.gz | |
Merge "Increase timeout of WaitCondition due to ConcurrentTransactions" into stable/mitaka6.0.0.0rc2
| -rw-r--r-- | heat_integrationtests/functional/test_os_wait_condition.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/heat_integrationtests/functional/test_os_wait_condition.py b/heat_integrationtests/functional/test_os_wait_condition.py index 5eb329438..5c1783af7 100644 --- a/heat_integrationtests/functional/test_os_wait_condition.py +++ b/heat_integrationtests/functional/test_os_wait_condition.py @@ -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) |