This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2537

tests: make get-with-headers flush after print() calls
AbandonedPublic

Authored by durin42 on Mar 2 2018, 9:50 AM.

Details

Reviewers
pulkit
yuja
Group Reviewers
hg-reviewers
Summary

This avoids some output buffering problems on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Mar 2 2018, 9:50 AM
pulkit accepted this revision.Mar 2 2018, 10:18 AM
yuja requested changes to this revision.Mar 2 2018, 11:04 AM
yuja added a subscriber: yuja.

Appears that this disclosed some weird issue:

--- tests/test-hgweb-commands.t
+++ tests/test-hgweb-commands.t.err
@@ -2116,7 +2116,10 @@
   $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=capabilities' | dd ibs=75 count=1 2> /dev/null; echo
   200 Script output follows

-  lookup changegroupsubset branchmap pushkey known
+  close failed in file object destructor:
+  sys.excepthook is missing
+  lost sys.stderr
+
This revision now requires changes to proceed.Mar 2 2018, 11:04 AM
durin42 abandoned this revision.Mar 2 2018, 4:33 PM

Revision Contents
Changeset List

PathPackages
Mtests/get-with-headers.py (1 line)

Diff 6327

tests/get-with-headers.py

if show[:1] == ['-']: if show[:1] == ['-']:
show = sorted(h for h, v in response.getheaders() show = sorted(h for h, v in response.getheaders()
if h.lower() not in show) 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:
print("%s: %s" % (h, response.getheader(h))) print("%s: %s" % (h, response.getheader(h)))
if not headeronly: if not headeronly:
print() print()
sys.stdout.flush()
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 = getattr(sys.stdout, 'buffer', sys.stdout) bodyfh = getattr(sys.stdout, 'buffer', sys.stdout)
# Pretty print JSON. This also has the beneficial side-effect # Pretty print JSON. This also has the beneficial side-effect