Patchwork [4,of,5] tests: update globs for Windows

login
register
mail settings
Submitter Matt Harbison
Date Jan. 8, 2017, 7:55 p.m.
Message ID <e37bd2d8a98e95e26c50.1483905342@Envy>
Download mbox | patch
Permalink /patch/18140/
State Accepted
Headers show

Comments

Matt Harbison - Jan. 8, 2017, 7:55 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1483901393 18000
#      Sun Jan 08 13:49:53 2017 -0500
# Node ID e37bd2d8a98e95e26c506ab00908f718f0e31ac0
# Parent  88f40d1242b598f22a886613425477476ad93819
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.

Patch

diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -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
diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t
--- a/tests/test-convert-git.t
+++ b/tests/test-convert-git.t
@@ -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
 
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -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