openstack
/
tempest
Code Issues Proposed changes

Merge "Support force-deletion of servers."

This commit is contained in:
Zuul 2020-04-03 20:19:09 +00:00 committed by Gerrit Code Review
parent 94e83edb27 d0ef93e016
commit 41f48727af
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/common/waiters.py
View File

@ -124,6 +124,12 @@ def wait_for_server_termination(client, server_id, ignore_error=False):
raise lib_exc.DeleteErrorException(
"Server %s failed to delete and is in ERROR status" %
server_id)
if server_status == 'SOFT_DELETED':
# Soft-deleted instances need to be forcibly deleted to
# prevent some test cases from failing.
LOG.debug("Automatically force-deleting soft-deleted server %s",
server_id)
client.force_delete_server(server_id)
if int(time.time()) - start_time >= client.build_timeout:
raise lib_exc.TimeoutException