openstack/python-glanceclient
Code Issues Proposed changes

Merge "allow unhandled exceptions to cause test errors"

Browse Source
This commit is contained in:
Jenkins
2017-06-28 14:27:47 +00:00
committed by Gerrit Code Review
parent 551fce5340 c8a7a5d56d
commit 66a2979291
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
glanceclient/tests/unit/test_ssl.py
View File

@@ -93,8 +93,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e: except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message: if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received') self.fail('No certificate failure message is received')
except Exception:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v1_requests_cert_verification_no_compression(self, __): def test_v1_requests_cert_verification_no_compression(self, __):
@@ -112,8 +110,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e: except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message: if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received') self.fail('No certificate failure message is received')
except Exception as e:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v2_requests_cert_verification(self, __): def test_v2_requests_cert_verification(self, __):
@@ -130,8 +126,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e: except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message: if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received') self.fail('No certificate failure message is received')
except Exception:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v2_requests_cert_verification_no_compression(self, __): def test_v2_requests_cert_verification_no_compression(self, __):
@@ -149,8 +143,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e: except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message: if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received') self.fail('No certificate failure message is received')
except Exception as e:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v2_requests_valid_cert_verification(self, __): def test_v2_requests_valid_cert_verification(self, __):
@@ -168,8 +160,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e: except exc.CommunicationError as e:
if 'certificate verify failed' in e.message: if 'certificate verify failed' in e.message:
self.fail('Certificate failure message is received') self.fail('Certificate failure message is received')
except Exception as e:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v2_requests_valid_cert_verification_no_compression(self, __): def test_v2_requests_valid_cert_verification_no_compression(self, __):
@@ -187,8 +177,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e: except exc.CommunicationError as e:
if 'certificate verify failed' in e.message: if 'certificate verify failed' in e.message:
self.fail('Certificate failure message is received') self.fail('Certificate failure message is received')
except Exception as e:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v2_requests_valid_cert_no_key(self, __): def test_v2_requests_valid_cert_no_key(self, __):
@@ -208,8 +196,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e: except exc.CommunicationError as e:
if ('PEM lib' not in e.message): if ('PEM lib' not in e.message):
self.fail('No appropriate failure message is received') self.fail('No appropriate failure message is received')
except Exception as e:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v2_requests_bad_cert(self, __): def test_v2_requests_bad_cert(self, __):
@@ -235,8 +221,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
'PEM lib' not in e.message or 'PEM lib' not in e.message or
six.PY3 and 'PEM lib' not in e.message): six.PY3 and 'PEM lib' not in e.message):
self.fail('No appropriate failure message is received') self.fail('No appropriate failure message is received')
except Exception as e:
self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr') @mock.patch('sys.stderr')
def test_v2_requests_bad_ca(self, __): def test_v2_requests_bad_ca(self, __):