This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2988

fix: use a portable python script instead of sed in test
ClosedPublic

Authored by hooper on Mar 30 2018, 8:15 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG41ba336d9f1e: fix: use a portable python script instead of sed in test

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

hooper created this revision.Mar 30 2018, 8:15 PM
mharbison72 added a subscriber: mharbison72.Mar 30 2018, 10:56 PM

sys.std* need the procutil.setbinary() treatment, and globbing applied to the delta below to keep Windows happy. Also, test-fix-topology.t probably needs the same fix.

--- c:/Users/Matt/projects/hg/tests/test-fix.t
+++ c:/Users/Matt/projects/hg/tests/test-fix.t.err
@@ -930,7 +935,7 @@
   $ hg commit -Aqm "foo"
   $ printf "Foo\nbar\nBaz\n" > foo.changed
   $ hg --debug fix --working-dir
-  subprocess: /usr/bin/python $TESTTMP/uppercase.py 1-1 3-3
+  subprocess: c:/Python27/python.exe $TESTTMP/uppercase.py 1-1 3-3

   $ cd ..

I'm not sure if you have any idea why, but it seems like {rootpath} is getting lost on Windows. (The changes here are because the printfs don't get run properly on Windows when run directly.)

https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-March/114691.html

hooper updated this revision to Diff 7522.Apr 2 2018, 3:33 PM
hooper added a comment.Apr 2 2018, 3:33 PM
  • subprocess: /usr/bin/python $TESTTMP/uppercase.py 1-1 3-3

+ subprocess: c:/Python27/python.exe $TESTTMP/uppercase.py 1-1 3-3

I had wondered if there's a reason we don't substitute $PYTHON like we do $TESTTMP? The glob makes the test a little weaker.

I'm not sure if you have any idea why, but it seems like {rootpath} is getting lost on Windows. (The changes here are because the printfs don't get run properly on Windows when run directly.)

Not sure.

mharbison72 added a subscriber: durin42.Apr 2 2018, 10:09 PM

I'm not sure what the state of this is (hg phabread failed for 3022 and 3023), but this works on Windows. I've got a separate patch to fix the printfs (which doesn't help the {rootpath} issue I mentioned).

In D2988#48851, @hooper wrote:
  • subprocess: /usr/bin/python $TESTTMP/uppercase.py 1-1 3-3

+ subprocess: c:/Python27/python.exe $TESTTMP/uppercase.py 1-1 3-3

I had wondered if there's a reason we don't substitute $PYTHON like we do $TESTTMP? The glob makes the test a little weaker.

Not sure, other than the invocation via $PYTHON is relatively new. I think @durin42 was the one who did most of that work. Masking the output seems useful too. (Hopefully it doesn't cause a headache on Windows.)

I'm not sure if you have any idea why, but it seems like {rootpath} is getting lost on Windows. (The changes here are because the printfs don't get run properly on Windows when run directly.)

Not sure.

hooper added a comment.Apr 2 2018, 10:13 PM
In D2988#48864, @mharbison72 wrote:

I'm not sure what the state of this is (hg phabread failed for 3022 and 3023), but this works on Windows. I've got a separate patch to fix the printfs (which doesn't help the {rootpath} issue I mentioned).

The other revisions were phabsend mistakes, I closed them.

durin42 added a comment.Apr 2 2018, 11:09 PM
In D2988#48864, @mharbison72 wrote:

I'm not sure what the state of this is (hg phabread failed for 3022 and 3023), but this works on Windows. I've got a separate patch to fix the printfs (which doesn't help the {rootpath} issue I mentioned).

In D2988#48851, @hooper wrote:
  • subprocess: /usr/bin/python $TESTTMP/uppercase.py 1-1 3-3

+ subprocess: c:/Python27/python.exe $TESTTMP/uppercase.py 1-1 3-3

I had wondered if there's a reason we don't substitute $PYTHON like we do $TESTTMP? The glob makes the test a little weaker.

Not sure, other than the invocation via $PYTHON is relatively new. I think @durin42 was the one who did most of that work. Masking the output seems useful too. (Hopefully it doesn't cause a headache on Windows.)

It never occurred to me. The work around $PYTHON in the tests was all around getting invocations to consistently use a single Python, instead of ninja-fallback to python when on python3 or pypy.

Probably worth doing though?

mharbison72 added a comment.Apr 10 2018, 11:24 PM

Any movement on this? There's a lot of test spew on Windows that this would cut out.

durin42 accepted this revision.Apr 11 2018, 1:18 PM

Sorry, this fell through the cracks somehow. Queued.

This revision is now accepted and ready to land.Apr 11 2018, 1:18 PM
Closed by commit rHG41ba336d9f1e: fix: use a portable python script instead of sed in test (authored by hooper). · Explain WhyApr 11 2018, 1:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-fix-topology.t (18 lines)
Mtests/test-fix.t (63 lines)

Diff 8006

tests/test-fix-topology.t

A script that implements uppercasing all letters in a file.
$ UPPERCASEPY="$TESTTMP/uppercase.py"
$ cat > $UPPERCASEPY <<EOF
> import sys
> from mercurial.utils.procutil import setbinary
> setbinary(sys.stdin)
> setbinary(sys.stdout)
> sys.stdout.write(sys.stdin.read().upper())
> EOF
$ TESTLINES="foo\nbar\nbaz\n"
$ printf $TESTLINES | $PYTHON $UPPERCASEPY
FOO
BAR
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.
Looks for correct incremental fixing and reproduction of parent/child Looks for correct incremental fixing and reproduction of parent/child
relationships. We indicate fixed file content by uppercasing it. relationships. We indicate fixed file content by uppercasing it.
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> fix = > fix =
> [fix] > [fix]
> uppercase-whole-file:command=sed -e 's/.*/\U&/' > uppercase-whole-file:command=$PYTHON $UPPERCASEPY
> uppercase-whole-file:fileset=set:** > uppercase-whole-file:fileset=set:**
> EOF > EOF
This tests the only behavior that should really be affected by obsolescence, so This tests the only behavior that should really be affected by obsolescence, so
we'll test it with evolution off and on. This only changes the revision we'll test it with evolution off and on. This only changes the revision
numbers, if all is well. numbers, if all is well.
#testcases obsstore-off obsstore-on #testcases obsstore-off obsstore-on

tests/test-fix.t

A script that implements uppercasing of specific lines in a file. This
approximates the behavior of code formatters well enough for our tests.
$ UPPERCASEPY="$TESTTMP/uppercase.py"
$ cat > $UPPERCASEPY <<EOF
> import sys
> from mercurial.utils.procutil import setbinary
> setbinary(sys.stdin)
> setbinary(sys.stdout)
> lines = set()
> for arg in sys.argv[1:]:
> if arg == 'all':
> sys.stdout.write(sys.stdin.read().upper())
> sys.exit(0)
> else:
> first, last = arg.split('-')
> lines.update(range(int(first), int(last) + 1))
> for i, line in enumerate(sys.stdin.readlines()):
> if i + 1 in lines:
> sys.stdout.write(line.upper())
> else:
> sys.stdout.write(line)
> EOF
$ TESTLINES="foo\nbar\nbaz\nqux\n"
$ printf $TESTLINES | $PYTHON $UPPERCASEPY
foo
bar
baz
qux
$ printf $TESTLINES | $PYTHON $UPPERCASEPY all
FOO
BAR
BAZ
QUX
$ printf $TESTLINES | $PYTHON $UPPERCASEPY 1-1
FOO
bar
baz
qux
$ printf $TESTLINES | $PYTHON $UPPERCASEPY 1-2
FOO
BAR
baz
qux
$ printf $TESTLINES | $PYTHON $UPPERCASEPY 2-3
foo
BAR
BAZ
qux
$ printf $TESTLINES | $PYTHON $UPPERCASEPY 2-2 4-4
foo
BAR
baz
QUX
Set up the config with two simple fixers: one that fixes specific line ranges, Set up the config with two simple fixers: one that fixes specific line ranges,
and one that always fixes the whole file. They both "fix" files by converting and one that always fixes the whole file. They both "fix" files by converting
letters to uppercase. They use different file extensions, so each test case can letters to uppercase. They use different file extensions, so each test case can
choose which behavior to use by naming files. choose which behavior to use by naming files.
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> fix = > fix =
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.allowunstable=True > evolution.allowunstable=True
> [fix] > [fix]
> uppercase-whole-file:command=sed -e 's/.*/\U&/' > uppercase-whole-file:command=$PYTHON $UPPERCASEPY all
> uppercase-whole-file:fileset=set:**.whole > uppercase-whole-file:fileset=set:**.whole
> uppercase-changed-lines:command=sed > uppercase-changed-lines:command=$PYTHON $UPPERCASEPY
> uppercase-changed-lines:linerange=-e '{first},{last} s/.*/\U&/' > uppercase-changed-lines:linerange={first}-{last}
> uppercase-changed-lines:fileset=set:**.changed > uppercase-changed-lines:fileset=set:**.changed
> EOF > EOF
Help text for fix. Help text for fix.
$ hg help fix $ hg help fix
hg fix [OPTION]... [FILE]... hg fix [OPTION]... [FILE]...
$ hg init debugoutput $ hg init debugoutput
$ cd debugoutput $ cd debugoutput
$ printf "foo\nbar\nbaz\n" > foo.changed $ printf "foo\nbar\nbaz\n" > foo.changed
$ hg commit -Aqm "foo" $ hg commit -Aqm "foo"
$ printf "Foo\nbar\nBaz\n" > foo.changed $ printf "Foo\nbar\nBaz\n" > foo.changed
$ hg --debug fix --working-dir $ hg --debug fix --working-dir
subprocess: sed -e '1,1 s/.*/\U&/' -e '3,3 s/.*/\U&/' subprocess: * $TESTTMP/uppercase.py 1-1 3-3 (glob)
$ cd .. $ cd ..
Fixing an obsolete revision can cause divergence, so we abort unless the user Fixing an obsolete revision can cause divergence, so we abort unless the user
configures to allow it. This is not yet smart enough to know whether there is a configures to allow it. This is not yet smart enough to know whether there is a
successor, but even then it is not likely intentional or idiomatic to fix an successor, but even then it is not likely intentional or idiomatic to fix an
obsolete revision. obsolete revision.