Merge "Use skipTest from testtools instead of inherited Exception"

swiftclient/exceptions.py

@@ -66,7 +66,3 @@ class ClientException(Exception):
                 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

tests/functional/test_swiftclient.py

@@ -70,8 +70,7 @@ class TestFunctional(testtools.TestCase):
     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,