mirror of
https://github.com/python/cpython.git
synced 2024-12-14 20:34:12 +08:00
Issue #13895: fix test_ssl hanging under Ubuntu
This commit is contained in:
parent
6b671b2591
commit
eba63c4203
@ -1078,28 +1078,28 @@ else:
|
||||
chatty=chatty,
|
||||
connectionchatty=False)
|
||||
with server:
|
||||
s = client_context.wrap_socket(socket.socket())
|
||||
s.connect((HOST, server.port))
|
||||
for arg in [indata, bytearray(indata), memoryview(indata)]:
|
||||
with client_context.wrap_socket(socket.socket()) as s:
|
||||
s.connect((HOST, server.port))
|
||||
for arg in [indata, bytearray(indata), memoryview(indata)]:
|
||||
if connectionchatty:
|
||||
if support.verbose:
|
||||
sys.stdout.write(
|
||||
" client: sending %r...\n" % indata)
|
||||
s.write(arg)
|
||||
outdata = s.read()
|
||||
if connectionchatty:
|
||||
if support.verbose:
|
||||
sys.stdout.write(" client: read %r\n" % outdata)
|
||||
if outdata != indata.lower():
|
||||
raise AssertionError(
|
||||
"bad data <<%r>> (%d) received; expected <<%r>> (%d)\n"
|
||||
% (outdata[:20], len(outdata),
|
||||
indata[:20].lower(), len(indata)))
|
||||
s.write(b"over\n")
|
||||
if connectionchatty:
|
||||
if support.verbose:
|
||||
sys.stdout.write(
|
||||
" client: sending %r...\n" % indata)
|
||||
s.write(arg)
|
||||
outdata = s.read()
|
||||
if connectionchatty:
|
||||
if support.verbose:
|
||||
sys.stdout.write(" client: read %r\n" % outdata)
|
||||
if outdata != indata.lower():
|
||||
raise AssertionError(
|
||||
"bad data <<%r>> (%d) received; expected <<%r>> (%d)\n"
|
||||
% (outdata[:20], len(outdata),
|
||||
indata[:20].lower(), len(indata)))
|
||||
s.write(b"over\n")
|
||||
if connectionchatty:
|
||||
if support.verbose:
|
||||
sys.stdout.write(" client: closing connection.\n")
|
||||
s.close()
|
||||
sys.stdout.write(" client: closing connection.\n")
|
||||
s.close()
|
||||
|
||||
def try_protocol_combo(server_protocol, client_protocol, expect_success,
|
||||
certsreqs=None, server_options=0, client_options=0):
|
||||
|
Loading…
Reference in New Issue
Block a user