From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 9 Jan 2014 20:28:48 +0000 (+0100)
Subject: Try to fix test_ssl failures on some buildbots
X-Git-Tag: v3.3.4rc1~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32c4915b239f435fd6c063b7f507b289a7a55f75;p=python

Try to fix test_ssl failures on some buildbots
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 1dd6829faf..9fc6027afb 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1440,9 +1440,9 @@ else:
                               ssl.get_protocol_name(server_protocol),
                               certtype))
         client_context = ssl.SSLContext(client_protocol)
-        client_context.options = ssl.OP_ALL | client_options
+        client_context.options |= client_options
         server_context = ssl.SSLContext(server_protocol)
-        server_context.options = ssl.OP_ALL | server_options
+        server_context.options |= server_options
         for ctx in (client_context, server_context):
             ctx.verify_mode = certsreqs
             # NOTE: we must enable "ALL" ciphers, otherwise an SSLv23 client