summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2016-06-13 06:40:00 (GMT)
committerMatthias Klose <doko@ubuntu.com>2016-06-13 06:40:00 (GMT)
commita8bb04b9a84fed27deb78391232a8f22b2f5f047 (patch)
tree22552998d72f04aa3043e65495ee88d93b91a018 /Lib/test
parent393c75932463cc06c9fd9fa41bfe7369c1139f5f (diff)
downloadcpython-a8bb04b9a84fed27deb78391232a8f22b2f5f047.zip
cpython-a8bb04b9a84fed27deb78391232a8f22b2f5f047.tar.gz
cpython-a8bb04b9a84fed27deb78391232a8f22b2f5f047.tar.bz2
Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.
Diffstat (limited to 'Lib/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 c1939b5..19ef354 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -686,7 +686,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