openstack/deb-ironic-inspector
Code Issues Proposed changes

Merge "Provide more meaningful message for error 500"

Browse Source
This commit is contained in:
Jenkins 2015-07-20 14:19:30 +00:00 committed by Gerrit Code Review
commit d3bd8f41d7
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic_inspector/main.py
View File

@ -55,7 +55,10 @@ def convert_exceptions(func):
except utils.Error as exc:
return error_response(exc, exc.http_code)
except Exception as exc:
return error_response(exc)
msg = _('Internal server error')
if CONF.debug:
msg += ' (%s): %s' % (exc.__class__.__name__, exc)
return error_response(msg)
return wrapper

34
ironic_inspector/test/test_main.py
View File

@ -33,6 +33,10 @@ from oslo_config import cfg
CONF = cfg.CONF
def _get_error(res):
return json.loads(res.data.decode('utf-8'))['error']['message']
class TestApi(test_base.BaseTest):
def setUp(self):
super(TestApi, self).setUp()
@ -112,9 +116,7 @@ class TestApi(test_base.BaseTest):
res = self.app.post('/v1/continue', data='"JSON"')
self.assertEqual(400, res.status_code)
process_mock.assert_called_once_with("JSON")
self.assertEqual(
'boom',
json.loads(res.data.decode('utf-8'))['error']['message'])
self.assertEqual('boom', _get_error(res))
@mock.patch.object(node_cache, 'get_node', autospec=True)
def test_get_introspection_in_progress(self, get_mock):
@ -141,16 +143,30 @@ class TestApi(test_base.BaseTest):
get_mock.side_effect = iter([utils.Error('boom', code=404)])
res = self.app.get('/v1/introspection/%s' % self.uuid)
self.assertEqual(404, res.status_code)
self.assertEqual(
'boom',
json.loads(res.data.decode('utf-8'))['error']['message'])
self.assertEqual('boom', _get_error(res))
def test_404_unexpected(self):
res = self.app.get('/v42')
self.assertEqual(404, res.status_code)
self.assertIn(
'not found',
json.loads(res.data.decode('utf-8'))['error']['message'].lower())
self.assertIn('not found', _get_error(res).lower())
@mock.patch.object(node_cache, 'get_node', autospec=True)
def test_500_with_debug(self, get_mock):
CONF.set_override('debug', True)
get_mock.side_effect = iter([RuntimeError('boom')])
res = self.app.get('/v1/introspection/%s' % self.uuid)
self.assertEqual(500, res.status_code)
self.assertEqual('Internal server error (RuntimeError): boom',
_get_error(res))
@mock.patch.object(node_cache, 'get_node', autospec=True)
def test_500_without_debug(self, get_mock):
CONF.set_override('debug', False)
get_mock.side_effect = iter([RuntimeError('boom')])
res = self.app.get('/v1/introspection/%s' % self.uuid)
self.assertEqual(500, res.status_code)
self.assertEqual('Internal server error',
_get_error(res))
class TestPlugins(unittest.TestCase):