tests: add globs for Windows
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 05 May 2016 21:14:12 -0400
changeset 29102 22c53b3a390d
parent 29101 57a24a85a2bc
child 29103 f2aa1c3e7e77
tests: add globs for Windows
tests/test-bugzilla.t
tests/test-convert.t
tests/test-notify.t
tests/test-subrepo-deep-nested-change.t
--- a/tests/test-bugzilla.t	Sat May 07 14:51:32 2016 +0100
+++ b/tests/test-bugzilla.t	Thu May 05 21:14:12 2016 -0400
@@ -54,7 +54,7 @@
   $ cat bzmock.log && rm bzmock.log
   update bugid=123, newstate={}, committer='test'
   ----
-  changeset 7875a8342c6f in repo $TESTTMP/mockremote refers to bug 123.
+  changeset 7875a8342c6f in repo $TESTTMP/mockremote refers to bug 123. (glob)
   details:
   	Fixes bug 123
   ----
--- a/tests/test-convert.t	Sat May 07 14:51:32 2016 +0100
+++ b/tests/test-convert.t	Thu May 05 21:14:12 2016 -0400
@@ -422,7 +422,7 @@
   assuming destination emptydir-hg
   initializing destination emptydir-hg repository
   emptydir does not look like a CVS checkout
-  $TESTTMP/emptydir does not look like a Git repository
+  $TESTTMP/emptydir does not look like a Git repository (glob)
   emptydir does not look like a Subversion repository
   emptydir is not a local Mercurial repository
   emptydir does not look like a darcs repository
--- a/tests/test-notify.t	Sat May 07 14:51:32 2016 +0100
+++ b/tests/test-notify.t	Thu May 05 21:14:12 2016 -0400
@@ -571,7 +571,7 @@
   Message-Id: <hg.3548c9e294b6.*.*@*> (glob)
   To: baz@test.com, foo@bar
   
-  changeset 3548c9e294b6 in $TESTTMP/b
+  changeset 3548c9e294b6 in $TESTTMP/b (glob)
   details: http://test/b?cmd=changeset;node=3548c9e294b6
   description: default template
 
--- a/tests/test-subrepo-deep-nested-change.t	Sat May 07 14:51:32 2016 +0100
+++ b/tests/test-subrepo-deep-nested-change.t	Thu May 05 21:14:12 2016 -0400
@@ -305,9 +305,9 @@
   archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
   Only in ../wdir: .hg_archival.txt
@@ -349,9 +349,9 @@
   archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   $ find ../wdir -type f | sort
   ../wdir/.hg_archival.txt
@@ -381,10 +381,10 @@
   archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   $ cat ../wdir/.hg_archival.txt
   repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
@@ -512,10 +512,10 @@
   archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   $ find ../archive_all | sort
   ../archive_all
@@ -549,8 +549,8 @@
   archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   $ find ../archive_exclude | sort
   ../archive_exclude
@@ -570,9 +570,9 @@
   archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/2\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============>                ] 1/2\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   $ find ../archive_include | sort
   ../archive_include
@@ -947,7 +947,7 @@
   archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [ <=>                             ] 0\r (no-eol) (esc)
+  archiving (sub1/sub2) [ <=>                             ] 0\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   archiving (sub3) [ <=>                                  ] 0\r (no-eol) (esc)
@@ -961,7 +961,7 @@
   archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [ <=>                             ] 0\r (no-eol) (esc)
+  archiving (sub1/sub2) [ <=>                             ] 0\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
   --- cloned.*/.hgsub	* (glob)
@@ -989,8 +989,8 @@
   archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   archiving [                                           ] 0/8\r (no-eol) (esc)
@@ -1008,10 +1008,10 @@
   archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [=========>                     ] 1/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [===================>           ] 2/3\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   archiving (sub3) [                                    ] 0/1\r (no-eol) (esc)
@@ -1086,8 +1086,8 @@
   archiving (sub1) [ <=>                                  ] 0\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (esc)
-  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+  archiving (sub1/sub2) [                               ] 0/1\r (no-eol) (glob) (esc)
+  archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   --- */cloned.*/sub1/sub2/sub2	* (glob)
   +++ */cloned/sub1/sub2/sub2	* (glob)