This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8342

tests: prevent printing \r to stdout
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG47e6ec977555: tests: prevent printing \r to stdout
Summary

Like we've done in other recent commits, we need to change
sys.stdout on Python 3 to not use os.linesep so output is
consistent on Python 3 on Windows.

With this change, test-notify.t now 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: rHG47e6ec977555: tests: prevent printing \r to stdout.Apr 1 2020, 3:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG47e6ec977555: tests: prevent printing \r to stdout (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-notify.t (9 lines)

Diff 20952

tests/test-notify.t

$ cat > $TESTTMP/filter.py <<EOF $ cat > $TESTTMP/filter.py <<EOF
> from __future__ import absolute_import, print_function > from __future__ import absolute_import, print_function
> import io
> import re > import re
> import sys > import sys
> if sys.version_info[0] >= 3:
> sys.stdout = io.TextIOWrapper(
> sys.stdout.buffer,
> sys.stdout.encoding,
> sys.stdout.errors,
> newline="\n",
> line_buffering=sys.stdout.line_buffering,
> )
> print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="") > print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="")
> EOF > EOF
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [experimental] > [experimental]
> evolution = true > evolution = true
> >
> [extensions] > [extensions]