[Python-checkins] cpython (3.3): Try to fix test_ssl failures on some buildbots

[antoine.pitrou]

http://hg.python.org/cpython/rev/36e17a81f81f
changeset:   88379:36e17a81f81f
branch:      3.3
parent:      88377:da8486e3e0eb
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Jan 09 21:28:48 2014 +0100
summary:
  Try to fix test_ssl failures on some buildbots

files:
  Lib/test/test_ssl.py |  4 ++--
  1 files changed, 2 insertions(+), 2 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
@@ -1440,9 +1440,9 @@
                               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

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