diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2014-01-09 20:30:17 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-01-09 20:30:17 (GMT) |
| commit | ba44860c118f375c81db1f82ac4714992a37a22e (patch) | |
| tree | df0b8740df3a234ec96ab31534185d7ce3c3334b /Lib/test | |
| parent | 78ace81c93568da30c789f85f8a8ebafb2ed89b2 (diff) | |
| parent | 32c4915b239f435fd6c063b7f507b289a7a55f75 (diff) | |
| download | cpython-ba44860c118f375c81db1f82ac4714992a37a22e.zip cpython-ba44860c118f375c81db1f82ac4714992a37a22e.tar.gz cpython-ba44860c118f375c81db1f82ac4714992a37a22e.tar.bz2 | |
Try to fix test_ssl failures on some buildbots
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | 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 index 34e8676..0dc04c0 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1859,9 +1859,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 # NOTE: we must enable "ALL" ciphers on the client, otherwise an # SSLv23 client will send an SSLv3 hello (rather than SSLv2) |