Mercurial > hg
changeset 30732:d4ec69ff652a
tests: update globs for Windows
The extra glob in test-command-template.t caused it to say no result was
reported. It used to be (within the past year), that both this and the missing
glob cases could be fixed simply by editing any output in the test, and
re-running it in interactive mode. But that no longer works, and I had to diff
*.t against *.t.err. I didn't dig into what changed.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 08 Jan 2017 13:49:53 -0500 |
| parents | b8a188a6f191 |
| children | 66448a53bdac |
| files | tests/test-command-template.t tests/test-convert-git.t tests/test-subrepo.t |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-command-template.t Sun Jan 08 12:05:10 2017 -0500 +++ b/tests/test-command-template.t Sun Jan 08 13:49:53 2017 -0500 @@ -3707,7 +3707,7 @@ a $ cd .. $ hg log -R r -r0 -T '{files % "{file|relpath}\n"}' - r/a (glob) + r/a $ cd r Test active bookmark templating
--- a/tests/test-convert-git.t Sun Jan 08 12:05:10 2017 -0500 +++ b/tests/test-convert-git.t Sun Jan 08 13:49:53 2017 -0500 @@ -750,7 +750,7 @@ $ COMMIT_OBJ=1c/0ce3c5886f83a1d78a7b517cdff5cf9ca17bdd $ mv git-repo4/.git/objects/$COMMIT_OBJ git-repo4/.git/objects/$COMMIT_OBJ.tmp $ hg convert git-repo4 git-repo4-broken-hg 2>&1 | grep 'abort:' - abort: cannot retrieve number of commits in $TESTTMP/git-repo4/.git + abort: cannot retrieve number of commits in $TESTTMP/git-repo4/.git (glob) $ mv git-repo4/.git/objects/$COMMIT_OBJ.tmp git-repo4/.git/objects/$COMMIT_OBJ damage git repository by renaming a blob object
--- a/tests/test-subrepo.t Sun Jan 08 12:05:10 2017 -0500 +++ b/tests/test-subrepo.t Sun Jan 08 13:49:53 2017 -0500 @@ -58,10 +58,10 @@ $ mkdir snot $ touch snot/file $ hg remove -S snot/file - not removing snot/file: file is untracked + not removing snot/file: file is untracked (glob) [1] $ hg cat snot/filenot - snot/filenot: no such file in rev 7cf8cfea66e4 + snot/filenot: no such file in rev 7cf8cfea66e4 (glob) [1] $ rm -r snot