summaryrefslogtreecommitdiffstats
path: root/Lib
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)
commitf7c562439b4aca9bd58689a32e035b9199818d0d (patch)
tree9ea2873f70968a58a52751f011d1bc72eddb8e6b /Lib
parent6e9a96be9e24265638df8aa600e566b306a23a2b (diff)
downloadcpython-f7c562439b4aca9bd58689a32e035b9199818d0d.zip
cpython-f7c562439b4aca9bd58689a32e035b9199818d0d.tar.gz
cpython-f7c562439b4aca9bd58689a32e035b9199818d0d.tar.bz2
Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.
Diffstat (limited to 'Lib')
-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 645ec8d..d2fc36d 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