[Python-checkins] cpython (merge 3.2 -> 3.2): - Issue #13218: Fix test_ssl failures on Debian/Ubuntu.

[barry.warsaw]

http://hg.python.org/cpython/rev/7a241bc34dd7
changeset:   73178:7a241bc34dd7
branch:      3.2
parent:      73173:efd28631b2a5
parent:      73177:415e2c998e18
user:        Barry Warsaw <barry at python.org>
date:        Fri Oct 28 17:02:27 2011 -0400
summary:
  - Issue #13218: Fix test_ssl failures on Debian/Ubuntu.

files:
  Lib/test/test_ssl.py |  6 ++++--
  Misc/NEWS            |  2 ++
  2 files changed, 6 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
@@ -1315,7 +1315,8 @@
             try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
             if hasattr(ssl, 'PROTOCOL_SSLv2'):
                 try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv2, False)
-            try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False)
+            try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False,
+                               client_options=ssl.OP_NO_SSLv3)
             try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
             if no_sslv2_implies_sslv3_hello():
                 # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs
@@ -1333,7 +1334,8 @@
             if hasattr(ssl, 'PROTOCOL_SSLv2'):
                 try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv2, False)
             try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False)
-            try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False)
+            try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False,
+                               client_options=ssl.OP_NO_TLSv1)
 
         def test_starttls(self):
             """Switching from clear text to encrypted and back again."""
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -171,6 +171,8 @@
 Tests
 -----
 
+- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
+
 - Issue #12821: Fix test_fcntl failures on OpenBSD 5.
 
 - Re-enable lib2to3's test_parser.py tests, though with an expected failure

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