(original) (raw)

changeset: 73179:472219ffa1d7 parent: 73174:ae78a2250b4c parent: 73178:7a241bc34dd7 user: Barry Warsaw barry@python.org date: Fri Oct 28 17:08:12 2011 -0400 files: Lib/test/test_ssl.py Misc/NEWS description: - Issue #13218: Fix test_ssl failures on Debian/Ubuntu. diff -r ae78a2250b4c -r 472219ffa1d7 Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Fri Oct 28 22:16:23 2011 +0200 +++ b/Lib/test/test_ssl.py Fri Oct 28 17:08:12 2011 -0400 @@ -1405,7 +1405,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 @@ -1423,7 +1424,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 ae78a2250b4c -r 472219ffa1d7 Misc/NEWS --- a/Misc/NEWS Fri Oct 28 22:16:23 2011 +0200 +++ b/Misc/NEWS Fri Oct 28 17:08:12 2011 -0400 @@ -1500,6 +1500,8 @@ Tests ----- +- Issue #13218: Fix test_ssl failures on Debian/Ubuntu. + - Re-enable lib2to3's test_parser.py tests, though with an expected failure (see issue 13125). /barry@python.org