[Python-checkins] r80867 - in python/branches/release26-maint: Lib/test/test_ssl.py Misc/NEWS
antoine.pitrou
python-checkins at python.org
Thu May 6 15:49:10 CEST 2010
Author: antoine.pitrou
Date: Thu May 6 15:49:10 2010
New Revision: 80867
Log:
Issue #8629: Disable some test_ssl tests, since they give different
results with OpenSSL 1.0.0 and higher.
Modified:
python/branches/release26-maint/Lib/test/test_ssl.py
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/test/test_ssl.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_ssl.py (original)
+++ python/branches/release26-maint/Lib/test/test_ssl.py Thu May 6 15:49:10 2010
@@ -716,7 +716,7 @@
raise
else:
if not expect_success:
- self.fail(
+ raise AssertionError(
"Client protocol %s succeeded with server protocol %s!"
% (ssl.get_protocol_name(client_protocol),
ssl.get_protocol_name(server_protocol)))
@@ -832,7 +832,9 @@
def test_protocol_sslv2(self):
"""Connecting to an SSLv2 server with various client options"""
if test_support.verbose:
- sys.stdout.write("\n")
+ sys.stdout.write("\ntest_protocol_sslv2 disabled, "
+ "as it fails on OpenSSL 1.0.0+")
+ return
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True)
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_OPTIONAL)
try_protocol_combo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True, ssl.CERT_REQUIRED)
@@ -843,7 +845,9 @@
def test_protocol_sslv23(self):
"""Connecting to an SSLv23 server with various client options"""
if test_support.verbose:
- sys.stdout.write("\n")
+ sys.stdout.write("\ntest_protocol_sslv23 disabled, "
+ "as it fails on OpenSSL 1.0.0+")
+ return
try:
try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True)
except (ssl.SSLError, socket.error), x:
@@ -867,7 +871,9 @@
def test_protocol_sslv3(self):
"""Connecting to an SSLv3 server with various client options"""
if test_support.verbose:
- sys.stdout.write("\n")
+ sys.stdout.write("\ntest_protocol_sslv3 disabled, "
+ "as it fails on OpenSSL 1.0.0+")
+ return
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True)
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL)
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
@@ -878,7 +884,9 @@
def test_protocol_tlsv1(self):
"""Connecting to a TLSv1 server with various client options"""
if test_support.verbose:
- sys.stdout.write("\n")
+ sys.stdout.write("\ntest_protocol_tlsv1 disabled, "
+ "as it fails on OpenSSL 1.0.0+")
+ return
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True)
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL)
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Thu May 6 15:49:10 2010
@@ -164,6 +164,9 @@
Tests
-----
+- Issue #8629: Disable some test_ssl tests, since they give different
+ results with OpenSSL 1.0.0 and higher.
+
- Issue #8576: Remove use of find_unused_port() in test_smtplib and
test_multiprocessing. Patch by Paul Moore.
More information about the Python-checkins
mailing list