This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11073

windows: make sure we fully read and cleany close the connection
ClosedPublic

Authored by marmoute on Jul 10 2021, 1:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6bceecb28806: windows: make sure we fully read and cleanly close the connection
Summary

Maybe this will prevent server on Windows to sometimes complains about the
client closing the connection too soon. So we make sure we read everything and
we officially close the connection.

Hopefully Windows will be happier and the test will stop being flaky.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/get-with-headers.py (9 lines)

Diff 29197

tests/get-with-headers.py

h for h, v in response.getheaders() if h.lower() not in show h for h, v in response.getheaders() if h.lower() not in show
) )
for h in [h.lower() for h in show]: for h in [h.lower() for h in show]:
if response.getheader(h, None) is not None: if response.getheader(h, None) is not None:
stdout.write( stdout.write(
b"%s: %s\n" b"%s: %s\n"
% (h.encode('ascii'), response.getheader(h).encode('ascii')) % (h.encode('ascii'), response.getheader(h).encode('ascii'))
) )
if not headeronly: if headeronly:
# still read the body to prevent windows to be unhappy about that
# (this might some flakyness in test-hgweb-filelog.t on Windows)
data = response.read()
else:
stdout.write(b'\n') stdout.write(b'\n')
data = response.read() data = response.read()
if args.bodyfile: if args.bodyfile:
bodyfh = open(args.bodyfile, 'wb') bodyfh = open(args.bodyfile, 'wb')
else: else:
bodyfh = stdout bodyfh = stdout
bodyfh.write(data) bodyfh.write(data)
if args.bodyfile: if args.bodyfile:
bodyfh.close() bodyfh.close()
if twice and response.getheader('ETag', None): if twice and response.getheader('ETag', None):
tag = response.getheader('ETag') tag = response.getheader('ETag')
# further try to please the windows-flakyness deity
conn.close()
return response.status return response.status
status = request(args.host, args.path, args.show) status = request(args.host, args.path, args.show)
if twice: if twice:
status = request(args.host, args.path, args.show) status = request(args.host, args.path, args.show)
if 200 <= status <= 305: if 200 <= status <= 305:
sys.exit(0) sys.exit(0)
sys.exit(1) sys.exit(1)