Replace ApiError with new exceptions

* Convert ApiError to EC2APIError
* Add new exceptions to replace ApiError where it didn't belong
* Fixes bug 926250

Change-Id: Ia711440ee0313faf8ea8c87e2c0a2f5b39cc55a2
This commit is contained in:
Brian Waldon
2012-02-03 13:29:57 -08:00
parent c9ca372b0b
commit afd5b22368
35 changed files with 237 additions and 229 deletions

View File

@@ -20,15 +20,15 @@ from nova import test
from nova import exception
class ApiErrorTestCase(test.TestCase):
class EC2APIErrorTestCase(test.TestCase):
def test_return_valid_error(self):
# without 'code' arg
err = exception.ApiError('fake error')
err = exception.EC2APIError('fake error')
self.assertEqual(err.__str__(), 'fake error')
self.assertEqual(err.code, None)
self.assertEqual(err.msg, 'fake error')
# with 'code' arg
err = exception.ApiError('fake error', 'blah code')
err = exception.EC2APIError('fake error', 'blah code')
self.assertEqual(err.__str__(), 'blah code: fake error')
self.assertEqual(err.code, 'blah code')
self.assertEqual(err.msg, 'fake error')