Merge "Use skipTest from testtools instead of inherited Exception"

openstack · Oct 9, 2014 · 83ca0b8 · 83ca0b8
2 parents c37cecb + 5ecff28
commit 83ca0b8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/swiftclient/exceptions.py b/swiftclient/exceptions.py
@@ -66,7 +66,3 @@ def __str__(self):
                 b += '  [first 60 chars of response] %s' \
                     % self.http_response_content[:60]
         return b and '%s: %s' % (a, b) or a
-
-
-class SkipTest(Exception):
-    pass
diff --git a/tests/functional/test_swiftclient.py b/tests/functional/test_swiftclient.py
@@ -70,8 +70,7 @@ def _get_config(self):
     def setUp(self):
         super(TestFunctional, self).setUp()
         if self.skip_tests:
-            raise swiftclient.exceptions.SkipTest(
-                'SKIPPING FUNCTIONAL TESTS DUE TO NO CONFIG')
+            self.skipTest('SKIPPING FUNCTIONAL TESTS DUE TO NO CONFIG')
 
         self.conn = swiftclient.Connection(
             self.auth_url, self.account_username, self.password,