openstack
/
nova
Code Issues Proposed changes

Merge "Fix TypeError conversion in API layer"

This commit is contained in:
Jenkins 2012-08-13 20:27:56 +00:00 committed by Gerrit Code Review
parent 7de1aca766 5646b96119
commit 3fc3dbe6ab
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/wsgi.py
View File

@ -628,7 +628,11 @@ class ResourceExceptionHandler(object):
elif isinstance(ex_value, exception.Invalid):
raise Fault(exception.ConvertedException(
code=ex_value.code, explanation=unicode(ex_value)))
elif isinstance(ex_value, TypeError):
# Under python 2.6, TypeError's exception value is actually a string,
# so test # here via ex_type instead:
# http://bugs.python.org/issue7853
elif issubclass(ex_type, TypeError):
exc_info = (ex_type, ex_value, ex_traceback)
LOG.error(_('Exception handling resource: %s') % ex_value,
exc_info=exc_info)

12
nova/tests/api/openstack/test_wsgi.py
View File

@ -752,6 +752,18 @@ class ResourceTest(test.TestCase):
self.assertEqual(called, [2])
self.assertEqual(response, 'foo')
def test_resource_exception_handler_type_error(self):
"""A TypeError should be translated to a Fault/HTTP 400"""
def foo(a,):
return a
try:
with wsgi.ResourceExceptionHandler():
foo() # generate a TypeError
self.fail("Should have raised a Fault (HTTP 400)")
except wsgi.Fault as fault:
self.assertEqual(400, fault.status_int)
class ResponseObjectTest(test.TestCase):
def test_default_code(self):