diff options
| author | Christian Schwede <christian.schwede@enovance.com> | 2014-10-01 11:23:40 +0000 |
|---|---|---|
| committer | Christian Schwede <christian.schwede@enovance.com> | 2014-10-08 07:10:23 +0000 |
| commit | 5ecff2868e211b2beb8228dd7265f42856081d99 (patch) | |
| tree | b8e98a01f7333cd34c1379844c689ec680920084 | |
| parent | bb4d2ab59c4de9389667eeed255642f51e276f1e (diff) | |
| download | python-swiftclient-5ecff2868e211b2beb8228dd7265f42856081d99.tar.gz | |
Use skipTest from testtools instead of inherited Exception
SkipTest is raised if there is no func_test section in the Swift test
config file. However, the currently raised Exception will result in a
failed test, not in a test marked as skipped.
Since we already use testtools we can use the included skipTest easily.
Change-Id: I1bbb1f9dbe31fb0698d774550708d1196b266625
| -rw-r--r-- | swiftclient/exceptions.py | 4 | ||||
| -rw-r--r-- | tests/functional/test_swiftclient.py | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/swiftclient/exceptions.py b/swiftclient/exceptions.py index 56c696f..9a77672 100644 --- a/swiftclient/exceptions.py +++ b/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 diff --git a/tests/functional/test_swiftclient.py b/tests/functional/test_swiftclient.py index f58009a..f5d14aa 100644 --- a/tests/functional/test_swiftclient.py +++ b/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, |