(original) (raw)

changeset: 73177:415e2c998e18 branch: 3.2 parent: 73167:09d0510e1c50 user: Barry Warsaw barry@python.org date: Fri Oct 28 16:52:17 2011 -0400 files: Lib/test/test_ssl.py Misc/NEWS description: - Issue #13218: Fix test_ssl failures on Debian/Ubuntu. diff -r 09d0510e1c50 -r 415e2c998e18 Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Fri Oct 28 15:00:50 2011 +0200 +++ b/Lib/test/test_ssl.py Fri Oct 28 16:52:17 2011 -0400 @@ -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 -r 09d0510e1c50 -r 415e2c998e18 Misc/NEWS --- a/Misc/NEWS Fri Oct 28 15:00:50 2011 +0200 +++ b/Misc/NEWS Fri Oct 28 16:52:17 2011 -0400 @@ -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 /barry@python.org