openstack/deb-heat
Code Issues Proposed changes

Prevent false positives of UPDATE_COMPLETE in integration tests

Browse Source 
Use the updated_at field in the stack output to check for
false positives of UPDATE_COMPLETE.

Partially-Closes Bug: #1433340

Change-Id: I8e68a2764741cc19305a0db7825322807b6508f3
This commit is contained in:
Sirushti Murugesan 2015-04-14 00:30:05 +05:30
parent 7c8619a205
commit db337c3aab
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
heat_integrationtests/common/test.py
View File

@ -88,6 +88,7 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
self.volume_client = self.manager.volume_client self.volume_client = self.manager.volume_client
self.object_client = self.manager.object_client self.object_client = self.manager.object_client
self.useFixture(fixtures.FakeLogger(format=_LOG_FORMAT)) self.useFixture(fixtures.FakeLogger(format=_LOG_FORMAT))
self.updated_time = {}
def get_remote_client(self, server_or_ip, username, private_key=None): def get_remote_client(self, server_or_ip, username, private_key=None):
if isinstance(server_or_ip, six.string_types): if isinstance(server_or_ip, six.string_types):
@ -246,6 +247,34 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
(resource_name, status, build_timeout)) (resource_name, status, build_timeout))
raise exceptions.TimeoutException(message) raise exceptions.TimeoutException(message)
def _verify_status(self, stack, stack_identifier, status, fail_regexp):
if stack.stack_status == status:
# Handle UPDATE_COMPLETE case: Make sure we don't
# wait for a stale UPDATE_COMPLETE status.
if status == 'UPDATE_COMPLETE':
if self.updated_time.get(
stack_identifier) != stack.updated_time:
self.updated_time[stack_identifier] = stack.updated_time
return True
else:
return True
if fail_regexp.search(stack.stack_status):
# Handle UPDATE_FAILED case.
if status == 'UPDATE_FAILED':
if self.updated_time.get(
stack_identifier) != stack.updated_time:
self.updated_time[stack_identifier] = stack.updated_time
raise exceptions.StackBuildErrorException(
stack_identifier=stack_identifier,
stack_status=stack.stack_status,
stack_status_reason=stack.stack_status_reason)
else:
raise exceptions.StackBuildErrorException(
stack_identifier=stack_identifier,
stack_status=stack.stack_status,
stack_status_reason=stack.stack_status_reason)
def _wait_for_stack_status(self, stack_identifier, status, def _wait_for_stack_status(self, stack_identifier, status,
failure_pattern='^.*_FAILED$', failure_pattern='^.*_FAILED$',
success_on_not_found=False): success_on_not_found=False):
@ -271,13 +300,10 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
# ignore this, as the resource may not have # ignore this, as the resource may not have
# been created yet # been created yet
else: else:
if stack.stack_status == status: if self._verify_status(stack, stack_identifier, status,
fail_regexp):
return return
if fail_regexp.search(stack.stack_status):
raise exceptions.StackBuildErrorException(
stack_identifier=stack_identifier,
stack_status=stack.stack_status,
stack_status_reason=stack.stack_status_reason)
time.sleep(build_interval) time.sleep(build_interval)
message = ('Stack %s failed to reach %s status within ' message = ('Stack %s failed to reach %s status within '