openstack/rally
Code Issues Proposed changes

Merge "Add resource fault detail in exception"

Browse Source
This commit is contained in:
Jenkins 2015-10-02 20:48:54 +00:00 committed by Gerrit Code Review
commit 77861e2c2f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rally/exceptions.py
View File

@ -137,7 +137,8 @@ class GetResourceNotFound(GetResourceFailure):
class GetResourceErrorStatus(GetResourceFailure): class GetResourceErrorStatus(GetResourceFailure):
msg_fmt = _("Resource %(resource)s has %(status)s status.") msg_fmt = _("Resource %(resource)s has %(status)s status.\n"
"Fault: %(fault)s")
class ScriptError(RallyException): class ScriptError(RallyException):

5
rally/task/utils.py
View File

@ -85,8 +85,9 @@ def get_from_manager(error_statuses=None):
if status in ("DELETED", "DELETE_COMPLETE"): if status in ("DELETED", "DELETE_COMPLETE"):
raise exceptions.GetResourceNotFound(resource=res) raise exceptions.GetResourceNotFound(resource=res)
if status in error_statuses: if status in error_statuses:
raise exceptions.GetResourceErrorStatus(resource=res, raise exceptions.GetResourceErrorStatus(
status=status) resource=res, status=status,
fault=getattr(res, "fault", "n/a"))
return res return res