This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10637

tests: change the fixer commands to use the buffer attribute on stdio objects
ClosedPublic

Authored by mharbison72 on May 3 2021, 2:22 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGea563187ee7c: tests: change the fixer commands to use the buffer attribute on stdio objects
Summary

Otherwise \r was getting injected into the fixed lines and throwing off the
commit hashes on Windows when the fixer is invoked with py3.

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

mharbison72 created this revision.May 3 2021, 2:22 PM
Alphare accepted this revision.May 6 2021, 12:32 PM
This revision is now accepted and ready to land.May 6 2021, 12:32 PM
baymax updated this revision to Diff 27676.May 6 2021, 1:17 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Revision Contents
Changeset List

PathPackages
Mtests/test-fix-topology.t (4 lines)
Mtests/test-fix.t (10 lines)

Diff 27681

tests/test-fix-topology.t

A script that implements uppercasing all letters in a file. A script that implements uppercasing all letters in a file.
$ UPPERCASEPY="$TESTTMP/uppercase.py" $ UPPERCASEPY="$TESTTMP/uppercase.py"
$ cat > $UPPERCASEPY <<EOF $ cat > $UPPERCASEPY <<EOF
> import sys > import sys
> from mercurial.utils.procutil import setbinary > from mercurial.utils.procutil import setbinary
> setbinary(sys.stdin) > setbinary(sys.stdin)
> setbinary(sys.stdout) > setbinary(sys.stdout)
> sys.stdout.write(sys.stdin.read().upper()) > stdin = getattr(sys.stdin, 'buffer', sys.stdin)
> stdout = getattr(sys.stdout, 'buffer', sys.stdout)
> stdout.write(stdin.read().upper())
> EOF > EOF
$ TESTLINES="foo\nbar\nbaz\n" $ TESTLINES="foo\nbar\nbaz\n"
$ printf $TESTLINES | "$PYTHON" $UPPERCASEPY $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY
FOO FOO
BAR BAR
BAZ BAZ
Tests for the fix extension's behavior around non-trivial history topologies. Tests for the fix extension's behavior around non-trivial history topologies.

tests/test-fix.t

A script that implements uppercasing of specific lines in a file. This A script that implements uppercasing of specific lines in a file. This
approximates the behavior of code formatters well enough for our tests. approximates the behavior of code formatters well enough for our tests.
$ UPPERCASEPY="$TESTTMP/uppercase.py" $ UPPERCASEPY="$TESTTMP/uppercase.py"
$ cat > $UPPERCASEPY <<EOF $ cat > $UPPERCASEPY <<EOF
> import sys > import sys
> from mercurial.utils.procutil import setbinary > from mercurial.utils.procutil import setbinary
> setbinary(sys.stdin) > setbinary(sys.stdin)
> setbinary(sys.stdout) > setbinary(sys.stdout)
> stdin = getattr(sys.stdin, 'buffer', sys.stdin)
> stdout = getattr(sys.stdout, 'buffer', sys.stdout)
> lines = set() > lines = set()
> for arg in sys.argv[1:]: > for arg in sys.argv[1:]:
> if arg == 'all': > if arg == 'all':
> sys.stdout.write(sys.stdin.read().upper()) > stdout.write(stdin.read().upper())
> sys.exit(0) > sys.exit(0)
> else: > else:
> first, last = arg.split('-') > first, last = arg.split('-')
> lines.update(range(int(first), int(last) + 1)) > lines.update(range(int(first), int(last) + 1))
> for i, line in enumerate(sys.stdin.readlines()): > for i, line in enumerate(stdin.readlines()):
> if i + 1 in lines: > if i + 1 in lines:
> sys.stdout.write(line.upper()) > stdout.write(line.upper())
> else: > else:
> sys.stdout.write(line) > stdout.write(line)
> EOF > EOF
$ TESTLINES="foo\nbar\nbaz\nqux\n" $ TESTLINES="foo\nbar\nbaz\nqux\n"
$ printf $TESTLINES | "$PYTHON" $UPPERCASEPY $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY
foo foo
bar bar
baz baz
qux qux
$ printf $TESTLINES | "$PYTHON" $UPPERCASEPY all $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY all