Merge "orchestration: tolerate NotFound in wait_for_stack_status"
This commit is contained in:
commit
9ed2b3ac94
|
@ -85,11 +85,8 @@ class BaseOrchestrationTest(tempest.test.BaseTestCase):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
for stack_identifier in cls.stacks:
|
for stack_identifier in cls.stacks:
|
||||||
try:
|
cls.client.wait_for_stack_status(
|
||||||
cls.client.wait_for_stack_status(
|
stack_identifier, 'DELETE_COMPLETE')
|
||||||
stack_identifier, 'DELETE_COMPLETE')
|
|
||||||
except exceptions.NotFound:
|
|
||||||
pass
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _create_keypair(cls, name_start='keypair-heat-'):
|
def _create_keypair(cls, name_start='keypair-heat-'):
|
||||||
|
|
|
@ -181,7 +181,11 @@ class OrchestrationClient(rest_client.RestClient):
|
||||||
fail_regexp = re.compile(failure_pattern)
|
fail_regexp = re.compile(failure_pattern)
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
resp, body = self.get_stack(stack_identifier)
|
try:
|
||||||
|
resp, body = self.get_stack(stack_identifier)
|
||||||
|
except exceptions.NotFound:
|
||||||
|
if status == 'DELETE_COMPLETE':
|
||||||
|
return
|
||||||
stack_name = body['stack_name']
|
stack_name = body['stack_name']
|
||||||
stack_status = body['stack_status']
|
stack_status = body['stack_status']
|
||||||
if stack_status == status:
|
if stack_status == status:
|
||||||
|
|
Loading…
Reference in New Issue