openstack/python-mistralclient
Code Issues Proposed changes

Merge "Show exact error message when authentication falied instead of HTML body"

Browse Source
This commit is contained in:
Jenkins
2015-10-09 07:22:24 +00:00
committed by Gerrit Code Review
parent 21e1cd8de3 a5e1e73e83
commit 5086e76f96
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mistralclient/api/base.py
View File

@@ -135,7 +135,8 @@ class ResourceManager(object):
def _raise_api_exception(self, resp): def _raise_api_exception(self, resp):
try: try:
error_data = get_json(resp).get("faultstring") error_data = (resp.headers.get("Server-Error-Message", None) or
get_json(resp).get("faultstring"))
except ValueError: except ValueError:
error_data = resp.content error_data = resp.content
raise APIException(error_code=resp.status_code, raise APIException(error_code=resp.status_code,

1
mistralclient/tests/unit/base.py
View File

@@ -24,6 +24,7 @@ class FakeResponse(object):
def __init__(self, status_code, content=None): def __init__(self, status_code, content=None):
self.status_code = status_code self.status_code = status_code
self.content = content self.content = content
self.headers = {}
def json(self): def json(self):
return json.loads(self.content) return json.loads(self.content)