Merge "Convert exception messages to strings"
This commit is contained in:
commit
af8816f20c
|
@ -23,6 +23,7 @@ SHOULD include dedicated exception logging.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
import six
|
||||||
|
|
||||||
import webob.exc
|
import webob.exc
|
||||||
from webob import util as woutil
|
from webob import util as woutil
|
||||||
|
@ -77,15 +78,16 @@ class NovaException(Exception):
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if not message:
|
try:
|
||||||
try:
|
if not message:
|
||||||
message = self.msg_fmt % kwargs
|
message = self.msg_fmt % kwargs
|
||||||
|
else:
|
||||||
except Exception:
|
message = six.text_type(message)
|
||||||
# NOTE(melwitt): This is done in a separate method so it can be
|
except Exception:
|
||||||
# monkey-patched during testing to make it a hard failure.
|
# NOTE(melwitt): This is done in a separate method so it can be
|
||||||
self._log_exception()
|
# monkey-patched during testing to make it a hard failure.
|
||||||
message = self.msg_fmt
|
self._log_exception()
|
||||||
|
message = self.msg_fmt
|
||||||
|
|
||||||
self.message = message
|
self.message = message
|
||||||
super(NovaException, self).__init__(message)
|
super(NovaException, self).__init__(message)
|
||||||
|
|
|
@ -153,6 +153,8 @@ class NovaExceptionTestCase(test.NoDBTestCase):
|
||||||
def test_error_msg(self):
|
def test_error_msg(self):
|
||||||
self.assertEqual('test',
|
self.assertEqual('test',
|
||||||
six.text_type(exception.NovaException('test')))
|
six.text_type(exception.NovaException('test')))
|
||||||
|
self.assertEqual('test',
|
||||||
|
exception.NovaException(Exception('test')).message)
|
||||||
|
|
||||||
def test_default_error_msg_with_kwargs(self):
|
def test_default_error_msg_with_kwargs(self):
|
||||||
class FakeNovaException(exception.NovaException):
|
class FakeNovaException(exception.NovaException):
|
||||||
|
|
Loading…
Reference in New Issue