summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiang Zhang <angwerzx@126.com>2017-03-01 07:36:15 (GMT)
committerGitHub <noreply@github.com>2017-03-01 07:36:15 (GMT)
commitc9ba1862222bcbb309278db028d33a57f039d587 (patch)
treeddc9c5698d00e5d4f7c0961759d79d2b1bf338c6
parentb4f0e980b6084e9a994e3f069269fac2471e0d78 (diff)
downloadcpython-c9ba1862222bcbb309278db028d33a57f039d587.zip
cpython-c9ba1862222bcbb309278db028d33a57f039d587.tar.gz
cpython-c9ba1862222bcbb309278db028d33a57f039d587.tar.bz2
bpo-26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test. (GH-374)
-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 a17d613..a1258c6 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -777,7 +777,8 @@ class ContextTests(unittest.TestCase):
ctx.options = (ctx.options & ~ssl.OP_NO_TLSv1)
self.assertEqual(default, 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