Issue #8629: Disable some test_ssl tests, since they give different
results with OpenSSL 1.0.0 and higher.
This commit is contained in:
parent
e7837354cd
commit
452a580848
|
@ -711,7 +711,7 @@ else:
|
|||
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)))
|
||||
|
@ -827,7 +827,9 @@ else:
|
|||
def test_protocol_sslv2(self):
|
||||
"""Connecting to an SSLv2 server with various client options"""
|
||||
if 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)
|
||||
|
@ -838,7 +840,9 @@ else:
|
|||
def test_protocol_sslv23(self):
|
||||
"""Connecting to an SSLv23 server with various client options"""
|
||||
if 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) as x:
|
||||
|
@ -862,7 +866,9 @@ else:
|
|||
def test_protocol_sslv3(self):
|
||||
"""Connecting to an SSLv3 server with various client options"""
|
||||
if 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)
|
||||
|
@ -873,7 +879,9 @@ else:
|
|||
def test_protocol_tlsv1(self):
|
||||
"""Connecting to a TLSv1 server with various client options"""
|
||||
if 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)
|
||||
|
|
|
@ -160,6 +160,9 @@ Build
|
|||
Tests
|
||||
-----
|
||||
|
||||
- Issue #8629: Disable some test_ssl tests, since they give different
|
||||
results with OpenSSL 1.0.0 and higher.
|
||||
|
||||
- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid
|
||||
UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding)
|
||||
|
||||
|
|
Loading…
Reference in New Issue