From 430975c2f7e354838a26cd81e59b5c0423a2c8fe Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 6 Apr 2011 19:13:18 -0700
Subject: ApiError code should default to None, and will only display a code if
 one exists.  Prior was output an 'ApiError: ApiError: error message' string,
 which is confusing

---
 nova/exception.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nova/exception.py b/nova/exception.py
index 4e2bbdbaf..c0bc68b6c 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -46,10 +46,14 @@ class Error(Exception):
 
 
 class ApiError(Error):
-    def __init__(self, message='Unknown', code='ApiError'):
+    def __init__(self, message='Unknown', code=None):
         self.message = message
         self.code = code
-        super(ApiError, self).__init__('%s: %s' % (code, message))
+        if code:
+            outstr = '%s: %s' % (code, message)
+        else:
+            outstr = '%s' % message
+        super(ApiError, self).__init__(outstr)
 
 
 class NotFound(Error):
-- 
cgit 


From 4c1c0b8357e2cffd5f9a2a1240439e1871f845f2 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 6 Apr 2011 19:43:58 -0700
Subject: add the tests

---
 nova/tests/test_exception.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 nova/tests/test_exception.py

diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py
new file mode 100644
index 000000000..65df20a61
--- /dev/null
+++ b/nova/tests/test_exception.py
@@ -0,0 +1,35 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from nova import test
+from nova import exception
+
+
+class ApiErrorTestCase(test.TestCase):
+
+    def test_return_valid_error(self):
+        # without 'code' arg
+        err = exception.ApiError('fake error')
+        self.assertEqual(err.__str__(), 'fake error')
+        self.assertEqual(err.code, None)
+        self.assertEqual(err.message, 'fake error')
+        # with 'code' arg
+        err = exception.ApiError('fake error', 'blah code')
+        self.assertEqual(err.__str__(), 'blah code: fake error')
+        self.assertEqual(err.code, 'blah code')
+        self.assertEqual(err.message, 'fake error')
-- 
cgit 


From c3ab4f023e2636e254f940e08da0aded42c0e96b Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Mon, 25 Apr 2011 12:55:59 -0400
Subject: removed extra newline

---
 nova/tests/test_exception.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py
index 65df20a61..1b0e41d9a 100644
--- a/nova/tests/test_exception.py
+++ b/nova/tests/test_exception.py
@@ -21,7 +21,6 @@ from nova import exception
 
 
 class ApiErrorTestCase(test.TestCase):
-
     def test_return_valid_error(self):
         # without 'code' arg
         err = exception.ApiError('fake error')
-- 
cgit