This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8144

tests: stabilize test-amend.t on Windows
ClosedPublic

Authored by mharbison72 on Feb 24 2020, 4:39 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1813f79017ac: tests: stabilize test-amend.t on Windows
Summary

If $TESTTMP isn't quoted in this context, it ends up like
C:Temphgtests.pikkoxchild1test-amend.t-obsstore-off.

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.Feb 24 2020, 4:39 PM
mharbison72 added a comment.Feb 24 2020, 4:54 PM

This is meant for stable. The other test fixes I'll submit shortly are for default.

marmoute accepted this revision.Feb 25 2020, 4:49 AM
pulkit accepted this revision.Feb 25 2020, 6:17 AM
This revision is now accepted and ready to land.Feb 25 2020, 6:17 AM
mharbison72 added a commit: rHG1813f79017ac: tests: stabilize test-amend.t on Windows.Feb 25 2020, 10:09 AM
Closed by commit rHG1813f79017ac: tests: stabilize test-amend.t on Windows (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-amend.t (2 lines)

Diff 20298

tests/test-amend.t

$ cd $TESTTMP $ cd $TESTTMP
$ hg init modify-during-amend; cd modify-during-amend $ hg init modify-during-amend; cd modify-during-amend
$ echo r0 > foo; hg commit -qAm "r0" $ echo r0 > foo; hg commit -qAm "r0"
$ echo alpha > foo; hg commit -qm "alpha" $ echo alpha > foo; hg commit -qm "alpha"
$ echo beta >> foo $ echo beta >> foo
$ cat > $TESTTMP/touchy_editor.sh <<EOF $ cat > $TESTTMP/touchy_editor.sh <<EOF
> sleep 1 > sleep 1
> echo delta >> $TESTTMP/modify-during-amend/foo > echo delta >> "$TESTTMP/modify-during-amend/foo"
> sleep 1 > sleep 1
> echo hi > "\$1" > echo hi > "\$1"
> sleep 1 > sleep 1
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/touchy_editor.sh" hg commit --amend $ HGEDITOR="sh $TESTTMP/touchy_editor.sh" hg commit --amend
$ if (hg diff -c . | grep 'delta' >/dev/null) || [ -n "$(hg status)" ]; then $ if (hg diff -c . | grep 'delta' >/dev/null) || [ -n "$(hg status)" ]; then
> echo "OK." > echo "OK."
> else > else