Merge "Don't use deprecated BaseException.message"

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/test_exception.py b/tests/test_exception.py
index ef06f633..33250835 100644
--- a/tests/test_exception.py
+++ b/tests/test_exception.py
@@ -83,6 +83,15 @@ class ExceptionTestCase(test.TestCase):
         self.assertEqual('Forbidden', e.title)
         self.assertEqual('Forbidden', j['error'].get('title'))
 
+    def test_unicode_message(self):
+        message = u'Comment \xe7a va'
+        e = exception.Error(message)
+
+        try:
+            self.assertEqual(unicode(e), message)
+        except UnicodeEncodeError:
+            self.fail("unicode error message not supported")
+
 
 class SecurityErrorTestCase(ExceptionTestCase):
     """Tests whether security-related info is exposed to the API user."""
@@ -144,12 +153,3 @@ class SecurityErrorTestCase(ExceptionTestCase):
         e = exception.ForbiddenAction(action=risky_info)
         self.assertValidJsonRendering(e)
         self.assertIn(risky_info, str(e))
-
-    def test_unicode_message(self):
-        message = u'Comment \xe7a va'
-        e = exception.Error(message)
-        self.assertEqual(e.message, message)
-        try:
-            unicode(e)
-        except UnicodeEncodeError:
-            self.fail("unicode error message not supported")