summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2014-01-09 20:28:48 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2014-01-09 20:28:48 (GMT)
commit32c4915b239f435fd6c063b7f507b289a7a55f75 (patch)
tree9b9a84d68fa6285f7164fa0f711b78ce7235c873
parent2f7c31678a85f599af30b983ecb8321f225c3f15 (diff)
downloadcpython-32c4915b239f435fd6c063b7f507b289a7a55f75.zip
cpython-32c4915b239f435fd6c063b7f507b289a7a55f75.tar.gz
cpython-32c4915b239f435fd6c063b7f507b289a7a55f75.tar.bz2
Try to fix test_ssl failures on some buildbots
-rw-r--r--Lib/test/test_ssl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 1dd6829..9fc6027 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