This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8341

tests: force \n newlines when writing to sys.stdout
ClosedPublic

Authored by indygreg on Mar 29 2020, 9:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd359f0d1a3d3: tests: force \n newlines when writing to sys.stdout
Summary

Without this, Python 3 on Windows inserts some \r that aren't
present in the input, causing test-http-bad-server.t to fail.
After this change, the test passes on Python 3 on Windows!

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.

Event Timeline

indygreg created this revision.Mar 29 2020, 9:30 PM
indygreg added a commit: rHGd359f0d1a3d3: tests: force \n newlines when writing to sys.stdout.Apr 1 2020, 3:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd359f0d1a3d3: tests: force \n newlines when writing to sys.stdout (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/filtertraceback.py (11 lines)

Diff 20951

tests/filtertraceback.py

#!/usr/bin/env python #!/usr/bin/env python
# Filters traceback lines from stdin. # Filters traceback lines from stdin.
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import io
import sys import sys
if sys.version_info[0] >= 3:
# Prevent \r from being inserted on Windows.
sys.stdout = io.TextIOWrapper(
sys.stdout.buffer,
sys.stdout.encoding,
sys.stdout.errors,
newline="\n",
line_buffering=sys.stdout.line_buffering,
)
state = 'none' state = 'none'
for line in sys.stdin: for line in sys.stdin:
if state == 'none': if state == 'none':
if line.startswith('Traceback '): if line.startswith('Traceback '):
state = 'tb' state = 'tb'
elif state == 'tb': elif state == 'tb':