From: Xiang Zhang <angwerzx@126.com>
Date: Wed, 1 Mar 2017 07:36:15 +0000 (+0800)
Subject: bpo-26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test. (GH-374)
X-Git-Tag: v2.7.14rc1~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9ba1862222bcbb309278db028d33a57f039d587;p=thirdparty%2FPython%2Fcpython.git

bpo-26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test. (GH-374)
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index a17d6131a6eb..a1258c65a576 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