summaryrefslogtreecommitdiffstats
path: root/tests/unit/test_exception.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-28 07:57:04 +0000
committerGerrit Code Review <review@openstack.org>2013-01-28 07:57:04 +0000
commit03dd4e7d4eb751bfad58322600464852942d5af9 (patch)
tree71d4bbb19edf558406d07cd8a917a8ef8c74d0c0 /tests/unit/test_exception.py
parent73c7cdc65f2c64f49139bbd2bb738635a34316e1 (diff)
parent8c80224ecb5194a5e2ed5f74f1c7f457202d21a3 (diff)
downloadoslo-03dd4e7d4eb751bfad58322600464852942d5af9.tar.gz
oslo-03dd4e7d4eb751bfad58322600464852942d5af9.tar.xz
oslo-03dd4e7d4eb751bfad58322600464852942d5af9.zip
Merge "Replace direct use of testtools BaseTestCase."
Diffstat (limited to 'tests/unit/test_exception.py')
-rw-r--r--tests/unit/test_exception.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/unit/test_exception.py b/tests/unit/test_exception.py
index ecfadb6..c03a41d 100644
--- a/tests/unit/test_exception.py
+++ b/tests/unit/test_exception.py
@@ -15,9 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import testtools
-
from openstack.common import exception
+from tests import utils
def good_function():
@@ -32,7 +31,7 @@ def bad_function_exception():
raise Exception()
-class WrapExceptionTest(testtools.TestCase):
+class WrapExceptionTest(utils.BaseTestCase):
def test_wrap_exception_good_return(self):
wrapped = exception.wrap_exception
@@ -47,7 +46,7 @@ class WrapExceptionTest(testtools.TestCase):
self.assertRaises(Exception, wrapped(bad_function_exception))
-class ApiErrorTest(testtools.TestCase):
+class ApiErrorTest(utils.BaseTestCase):
def test_without_code(self):
err = exception.ApiError('fake error')
@@ -62,7 +61,7 @@ class ApiErrorTest(testtools.TestCase):
self.assertEqual(err.message, 'fake error')
-class BadStoreUriTest(testtools.TestCase):
+class BadStoreUriTest(utils.BaseTestCase):
def test(self):
uri = 'http:///etc/passwd'
@@ -72,7 +71,7 @@ class BadStoreUriTest(testtools.TestCase):
self.assertTrue(reason in str(err.message))
-class UnknownSchemeTest(testtools.TestCase):
+class UnknownSchemeTest(utils.BaseTestCase):
def test(self):
scheme = 'http'
@@ -80,7 +79,7 @@ class UnknownSchemeTest(testtools.TestCase):
self.assertTrue(scheme in str(err.message))
-class OpenstackExceptionTest(testtools.TestCase):
+class OpenstackExceptionTest(utils.BaseTestCase):
class TestException(exception.OpenstackException):
message = '%(test)s'