diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-10 19:12:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-10 19:12:07 +0000 |
| commit | f2cfbba78c0bfb5d48f32d86182f3e39f317ec82 (patch) | |
| tree | 2ebbd01bc51a72f0b1e9cbd54d0dd02cb9858fd5 | |
| parent | ede6efa550a2679fe637c474b26fa15fed406953 (diff) | |
| parent | b9438ca296613799970231170f2e98ec6dc40747 (diff) | |
| download | oslo-incubator-f2cfbba78c0bfb5d48f32d86182f3e39f317ec82.tar.gz | |
Merge "Update tests for optional sslv3"
| -rw-r--r-- | tests/unit/test_sslutils.py | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/tests/unit/test_sslutils.py b/tests/unit/test_sslutils.py index 0c5b2a5d..6d8eca31 100644 --- a/tests/unit/test_sslutils.py +++ b/tests/unit/test_sslutils.py @@ -21,33 +21,28 @@ from openstack.common import sslutils class SSLUtilsTest(test_base.BaseTestCase): def test_valid_versions(self): - self.assertEqual(sslutils.validate_ssl_version("SSLv3"), - ssl.PROTOCOL_SSLv3) self.assertEqual(sslutils.validate_ssl_version("SSLv23"), ssl.PROTOCOL_SSLv23) self.assertEqual(sslutils.validate_ssl_version("TLSv1"), ssl.PROTOCOL_TLSv1) - try: - protocol = ssl.PROTOCOL_SSLv2 - except AttributeError: - pass - else: - self.assertEqual(sslutils.validate_ssl_version("SSLv2"), protocol) + if hasattr(ssl, 'PROTOCOL_SSLv2'): + self.assertEqual(sslutils.validate_ssl_version("SSLv2"), + ssl.PROTOCOL_SSLv2) + if hasattr(ssl, 'PROTOCOL_SSLv3'): + self.assertEqual(sslutils.validate_ssl_version("SSLv3"), + ssl.PROTOCOL_SSLv3) def test_lowercase_valid_versions(self): - self.assertEqual(sslutils.validate_ssl_version("sslv3"), - ssl.PROTOCOL_SSLv3) self.assertEqual(sslutils.validate_ssl_version("sslv23"), ssl.PROTOCOL_SSLv23) self.assertEqual(sslutils.validate_ssl_version("tlsv1"), ssl.PROTOCOL_TLSv1) - try: - protocol = ssl.PROTOCOL_SSLv2 - except AttributeError: - pass - else: + if hasattr(ssl, 'PROTOCOL_SSLv2'): self.assertEqual(sslutils.validate_ssl_version("sslv2"), - protocol) + ssl.PROTOCOL_SSLv2) + if hasattr(ssl, 'PROTOCOL_SSLv3'): + self.assertEqual(sslutils.validate_ssl_version("sslv3"), + ssl.PROTOCOL_SSLv3) def test_invalid_version(self): self.assertRaises(RuntimeError, @@ -62,3 +57,11 @@ class SSLUtilsTest(test_base.BaseTestCase): self.assertRaises(RuntimeError, sslutils.validate_ssl_version, "SSLv2") + + # The same is now true of SSLv3 + try: + ssl.PROTOCOL_SSLv3 + except AttributeError: + self.assertRaises(RuntimeError, + sslutils.validate_ssl_version, + "SSLv3") |