openstack
/
deb-python-openstacksdk
Code Issues Proposed changes

Merge "Fix exception parsing error"

This commit is contained in:
Jenkins 2017-01-31 13:53:58 +00:00 committed by Gerrit Code Review
parent 95de0fc56f 4662a9f2be
commit ed5d3570f7
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack/exceptions.py
View File

@ -125,7 +125,8 @@ def from_exception(exc):
content_type = resp.headers.get('content-type', '')
if resp_body and 'application/json' in content_type:
# Iterate over the nested objects to retrieve "message" attribute.
messages = [obj.get('message') for obj in resp.json().values()]
messages = [obj.get('message') for obj in resp.json().values()
if isinstance(obj, dict)]
# Join all of the messages together nicely and filter out any objects
# that don't have a "message" attr.
details = '\n'.join(msg for msg in messages if msg)

21
openstack/tests/unit/test_session.py
View File

@ -137,6 +137,27 @@ class TestSession(testtools.TestCase):
self.assertIn('OverLimit413...', os_exc.details)
self.assertIn('OverLimit Retry...', os_exc.details)
def test_map_exceptions_http_exception_handle_json_1(self):
# A test for json containing non-dict values
mock_resp = mock.Mock()
mock_resp.status_code = 404
mock_resp.json.return_value = {
"code": 404,
"error": {
"message": "resource not found",
},
}
mock_resp.headers = {
"content-type": "application/json"
}
ksa_exc = _exceptions.HttpError(message="test", http_status=404,
response=mock_resp)
func = mock.Mock(side_effect=ksa_exc)
os_exc = self._assert_map_exceptions(
exceptions.HttpException, ksa_exc, func)
self.assertIn('not found', os_exc.details)
def test_map_exceptions_notfound_exception_handle_html(self):
mock_resp = mock.Mock()
mock_resp.status_code = 404