summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-28 14:27:47 +0000
committerGerrit Code Review <review@openstack.org>2017-06-28 14:27:47 +0000
commit66a297929112830a4a18eba210a2f4a77570fcae (patch)
tree67ac6b86f88ebf9b46bc0765d862f0b939fbf1ec
parent551fce53400454915e1d7935dda0b8a23cb60b2c (diff)
parentc8a7a5d56de30cb596d21553f5dbf7ea3db866d8 (diff)
downloadpython-glanceclient-66a297929112830a4a18eba210a2f4a77570fcae.tar.gz
Merge "allow unhandled exceptions to cause test errors"
-rw-r--r--glanceclient/tests/unit/test_ssl.py16
1 files changed, 0 insertions, 16 deletions
diff --git a/glanceclient/tests/unit/test_ssl.py b/glanceclient/tests/unit/test_ssl.py
index 9bca2ec..323ac9d 100644
--- a/glanceclient/tests/unit/test_ssl.py
+++ b/glanceclient/tests/unit/test_ssl.py
@@ -93,8 +93,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received')
- except Exception:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v1_requests_cert_verification_no_compression(self, __):
@@ -112,8 +110,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received')
- except Exception as e:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v2_requests_cert_verification(self, __):
@@ -130,8 +126,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received')
- except Exception:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v2_requests_cert_verification_no_compression(self, __):
@@ -149,8 +143,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e:
if 'certificate verify failed' not in e.message:
self.fail('No certificate failure message is received')
- except Exception as e:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v2_requests_valid_cert_verification(self, __):
@@ -168,8 +160,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e:
if 'certificate verify failed' in e.message:
self.fail('Certificate failure message is received')
- except Exception as e:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v2_requests_valid_cert_verification_no_compression(self, __):
@@ -187,8 +177,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e:
if 'certificate verify failed' in e.message:
self.fail('Certificate failure message is received')
- except Exception as e:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v2_requests_valid_cert_no_key(self, __):
@@ -208,8 +196,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
except exc.CommunicationError as e:
if ('PEM lib' not in e.message):
self.fail('No appropriate failure message is received')
- except Exception as e:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v2_requests_bad_cert(self, __):
@@ -235,8 +221,6 @@ class TestHTTPSVerifyCert(testtools.TestCase):
'PEM lib' not in e.message or
six.PY3 and 'PEM lib' not in e.message):
self.fail('No appropriate failure message is received')
- except Exception as e:
- self.fail('Unexpected exception has been raised')
@mock.patch('sys.stderr')
def test_v2_requests_bad_ca(self, __):