From 8f370d6174c7574c6ee611b5089eac8a4c37dbf2 Mon Sep 17 00:00:00 2001 From: Sergey Kraynev Date: Thu, 24 Mar 2016 04:30:39 -0400 Subject: [PATCH] Increase timeout of WaitCondition due to ConcurrentTransactions Currently we have retry logic with random period of delay. There is a chance, when we have several re-try attemts with maximum timeout, so it can be a root cause of floating fails, when we have not enough time for getting all signals. Also decrease number of signals from 30 to 25, due to small risk, when one of signals goes to ConcurrentTransaction error. Note, that all these changes are made in corresponding functional test and don't affect main code. Change-Id: I9ca85c4378d0f62e316f4f40ff73597ffaaabadf Related-Bug: #1497274 --- .../functional/test_os_wait_condition.py | 9 +++++---- 1 file 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 5eb3294383..5c1783af7f 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)