mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge from 3.5.

Browse source
This commit is contained in:
Larry Hastings 2016-06-26 20:00:51 -07:00
commit c2f2ef8faa
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_ssl.py
View file

@ -844,7 +844,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