[Python-checkins] cpython (3.4): Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.

[larry.hastings]

https://hg.python.org/cpython/rev/8f028d04df11
changeset:   102198:8f028d04df11
branch:      3.4
parent:      101970:ca24b5b2d7fe
user:        Matthias Klose <doko at ubuntu.com>
date:        Sun Jun 12 23:40:00 2016 -0700
summary:
  Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.

files:
  Lib/test/test_ssl.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -686,7 +686,8 @@
             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

-- 
Repository URL: https://hg.python.org/cpython