openstack/python-swiftclient
Code Issues Proposed changes

Merge "Use skipTest from testtools instead of inherited Exception"

Browse Source
This commit is contained in:
Jenkins 2014-10-09 10:14:00 +00:00 committed by Gerrit Code Review
commit 83ca0b825d
2 changed files with 1 additions and 6 deletions
swiftclient
exceptions.py
tests/functional
test_swiftclient.py

4
swiftclient/exceptions.py

@ -66,7 +66,3 @@ class ClientException(Exception):
b += ' [first 60 chars of response] %s' \ b += ' [first 60 chars of response] %s' \
% self.http_response_content[:60] % self.http_response_content[:60]
return b and '%s: %s' % (a, b) or a return b and '%s: %s' % (a, b) or a
class SkipTest(Exception):
pass

3
tests/functional/test_swiftclient.py

@ -70,8 +70,7 @@ class TestFunctional(testtools.TestCase):
def setUp(self): def setUp(self):
super(TestFunctional, self).setUp() super(TestFunctional, self).setUp()
if self.skip_tests: if self.skip_tests:
raise swiftclient.exceptions.SkipTest( self.skipTest('SKIPPING FUNCTIONAL TESTS DUE TO NO CONFIG')
'SKIPPING FUNCTIONAL TESTS DUE TO NO CONFIG')
self.conn = swiftclient.Connection( self.conn = swiftclient.Connection(
self.auth_url, self.account_username, self.password, self.auth_url, self.account_username, self.password,