summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2016-06-12 23:40:00 -0700
committerMatthias Klose <doko@ubuntu.com>2016-06-12 23:40:00 -0700
commit2e5067e8ddb1bec6b65421a92cf2eb1177fd82df (patch)
treee836c3dc294e858417623e8f560289b264e658f1
parent4f6cf8aa3834a9e47e43744bc0c7795658a5b403 (diff)
downloadcpython-2e5067e8ddb1bec6b65421a92cf2eb1177fd82df.tar.gz
Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.
-rw-r--r--Lib/test/test_ssl.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 645ec8d100..d2fc36d84e 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -821,7 +821,8 @@ class ContextTests(unittest.TestCase):
self.assertEqual(ssl.OP_ALL | ssl.OP_NO_TLSv1 | ssl.OP_NO_SSLv3,
ctx.options)
ctx.options = 0
- self.assertEqual(0, ctx.options)
+ # Ubuntu has OP_NO_SSLv3 forced on by default
+ self.assertEqual(0, ctx.options & ~ssl.OP_NO_SSLv3)
else:
with self.assertRaises(ValueError):
ctx.options = 0