openstack
/
tempest
Code Issues Proposed changes

Merge "Early die if on image gets killed"

This commit is contained in:
Jenkins 2013-10-25 21:14:22 +00:00 committed by Gerrit Code Review
parent 261db291a0 195f1d492a
commit 432769935f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/exceptions.py
View File

@ -81,6 +81,10 @@ class BuildErrorException(TempestException):
message = "Server %(server_id)s failed to build and is in ERROR status"
class ImageKilledException(TempestException):
message = "Image %(image_id)s 'killed' while waiting for %(status)s"
class AddImageException(TempestException):
message = "Image %(image_id)s failed to become ACTIVE in the allotted time"

5
tempest/services/image/v1/json/image_client.py
View File

@ -265,9 +265,12 @@ class ImageClientJSON(RestClient):
LOG.info('Value transition from "%s" to "%s"'
'in %d second(s).', old_value,
value, dtime)
if (value == status):
if value == status:
return value
if value == 'killed':
raise exceptions.ImageKilledException(image_id=image_id,
status=value)
if dtime > self.build_timeout:
message = ('Time Limit Exceeded! (%ds)'
'while waiting for %s, '