diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-23 13:28:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-23 13:28:45 +0000 |
| commit | 8418dd3fba2f6f3ca4c635a26eeb61fd37d05f86 (patch) | |
| tree | 1d655bb2b73f7380c7081662b020f885f22d2ff3 /tests/unit | |
| parent | 53bd102c75ee5040323b47e14ad9b3faae6db6eb (diff) | |
| parent | 05f33ec591acd2870130a2e5eb4c29994b11fbe6 (diff) | |
| download | oslo-8418dd3fba2f6f3ca4c635a26eeb61fd37d05f86.tar.gz oslo-8418dd3fba2f6f3ca4c635a26eeb61fd37d05f86.tar.xz oslo-8418dd3fba2f6f3ca4c635a26eeb61fd37d05f86.zip | |
Merge "Exception code cleanup"
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/rpc/test_common.py | 3 | ||||
| -rw-r--r-- | tests/unit/test_exception.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/unit/rpc/test_common.py b/tests/unit/rpc/test_common.py index 669e8f7..291f823 100644 --- a/tests/unit/rpc/test_common.py +++ b/tests/unit/rpc/test_common.py @@ -59,7 +59,6 @@ class RpcCommonTestCase(test_utils.BaseTestCase): failure = rpc_common.serialize_remote_exception(sys.exc_info()) failure = jsonutils.loads(failure) - #assure the traceback was added self.assertEqual(expected['class'], failure['class']) self.assertEqual(expected['module'], failure['module']) self.assertEqual(expected['message'], failure['message']) @@ -80,7 +79,6 @@ class RpcCommonTestCase(test_utils.BaseTestCase): failure = rpc_common.serialize_remote_exception(sys.exc_info()) failure = jsonutils.loads(failure) - #assure the traceback was added self.assertEqual(expected['class'], failure['class']) self.assertEqual(expected['module'], failure['module']) self.assertEqual(expected['message'], failure['message']) @@ -93,7 +91,6 @@ class RpcCommonTestCase(test_utils.BaseTestCase): 'class': 'OpenstackException', 'module': 'openstack.common.exception', 'message': exception.OpenstackException.msg_fmt, - 'tb': ['raise OpenstackException'], } def raise_remote_exception(): diff --git a/tests/unit/test_exception.py b/tests/unit/test_exception.py index e0c55d5..407e68d 100644 --- a/tests/unit/test_exception.py +++ b/tests/unit/test_exception.py @@ -50,13 +50,13 @@ class ApiErrorTest(utils.BaseTestCase): def test_without_code(self): err = exception.ApiError('fake error') - self.assertEqual(err.__str__(), 'Unknown: fake error') + self.assertEqual(str(err), 'Unknown: fake error') self.assertEqual(err.code, 'Unknown') self.assertEqual(err.api_message, 'fake error') def test_with_code(self): err = exception.ApiError('fake error', 'blah code') - self.assertEqual(err.__str__(), 'blah code: fake error') + self.assertEqual(str(err), 'blah code: fake error') self.assertEqual(err.code, 'blah code') self.assertEqual(err.api_message, 'fake error') |