openstack
/
tempest
Code Issues Proposed changes

Merge "Add DeleteErrorException"

This commit is contained in:
Jenkins 2017-02-17 02:10:08 +00:00 committed by Gerrit Code Review
parent 2c1002eccb 33726c3ef2
commit 1d41b4bcd9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/common/waiters.py
View File

@ -121,7 +121,7 @@ def wait_for_server_termination(client, server_id, ignore_error=False):
'/'.join((server_status, str(task_state))),
time.time() - start_time)
if server_status == 'ERROR' and not ignore_error:
raise exceptions.BuildErrorException(server_id=server_id)
raise lib_exc.DeleteErrorException(resource_id=server_id)
if int(time.time()) - start_time >= client.build_timeout:
raise lib_exc.TimeoutException

5
tempest/lib/exceptions.py
View File

@ -264,3 +264,8 @@ class PluginRegistrationException(TempestException):
class VolumeBackupException(TempestException):
message = "Volume backup %(backup_id)s failed and is in ERROR status"
class DeleteErrorException(TempestException):
message = ("Resource %(resource_id)s failed to delete "
"and is in ERROR status")