[PATCH 2 of 2] test-walk: enable for Windows

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1339406116 -7200
# Node ID 436ea1d50a23c1019f163c643b3f758eca03ea9e
# Parent  5670fe8f8e3a63b18767ee38f55a14b847356e71
test-walk: enable for Windows

diff --git a/tests/test-walk.t b/tests/test-walk.t
--- a/tests/test-walk.t
+++ b/tests/test-walk.t
@@ -1,5 +1,3 @@
-  $ "$TESTDIR/hghave" no-windows || exit 80
-
   $ hg init t
   $ cd t
   $ mkdir -p beans
@@ -14,7 +12,6 @@
   $ echo fennel > fennel
   $ echo fenugreek > fenugreek
   $ echo fiddlehead > fiddlehead
-  $ echo glob:glob > glob:glob
   $ hg addremove
   adding beans/black
   adding beans/borlotti
@@ -25,12 +22,10 @@
   adding fennel
   adding fenugreek
   adding fiddlehead
-  adding glob:glob
   adding mammals/Procyonidae/cacomistle
   adding mammals/Procyonidae/coatimundi
   adding mammals/Procyonidae/raccoon
   adding mammals/skunk
-  warning: filename contains ':', which is reserved on Windows: 'glob:glob'
   $ hg commit -m "commit #0"
 
   $ hg debugwalk
@@ -43,7 +38,6 @@
   f  fennel                          fennel
   f  fenugreek                       fenugreek
   f  fiddlehead                      fiddlehead
-  f  glob:glob                       glob:glob
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
@@ -58,7 +52,6 @@
   f  fennel                          fennel
   f  fenugreek                       fenugreek
   f  fiddlehead                      fiddlehead
-  f  glob:glob                       glob:glob
   f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
@@ -75,7 +68,6 @@
   f  fennel                          ../fennel
   f  fenugreek                       ../fenugreek
   f  fiddlehead                      ../fiddlehead
-  f  glob:glob                       ../glob:glob
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
@@ -84,7 +76,6 @@
   f  fennel                          ../fennel
   f  fenugreek                       ../fenugreek
   f  fiddlehead                      ../fiddlehead
-  f  glob:glob                       ../glob:glob
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
@@ -114,13 +105,18 @@
   f  beans/navy      ../beans/navy
   f  beans/pinto     ../beans/pinto
   f  beans/turtle    ../beans/turtle
-  $ hg debugwalk -I 'relpath:../beans'
+
+(arguments 'foo:../bar' are mangled by MSYS, so we do these in Python)
+
+  >>> from mercurial.dispatch import request, dispatch
+  >>> dispatch(request(['debugwalk', '-I', 'relpath:../beans']))
   f  beans/black     ../beans/black
   f  beans/borlotti  ../beans/borlotti
   f  beans/kidney    ../beans/kidney
   f  beans/navy      ../beans/navy
   f  beans/pinto     ../beans/pinto
   f  beans/turtle    ../beans/turtle
+
   $ hg debugwalk .
   f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
   f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
@@ -161,7 +157,7 @@
   f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
   f  mammals/skunk                   skunk
   $ hg debugwalk .hg
-  abort: path 'mammals/.hg' is inside nested repo 'mammals'
+  abort: path 'mammals/.hg' is inside nested repo 'mammals' (glob)
   [255]
   $ hg debugwalk ../.hg
   abort: path contains illegal component: .hg
@@ -202,10 +198,10 @@
   abort: path contains illegal component: .hg
   [255]
   $ hg debugwalk beans/../.hg/data
-  abort: path contains illegal component: .hg/data
+  abort: path contains illegal component: .hg/data (glob)
   [255]
   $ hg debugwalk beans/.hg
-  abort: path 'beans/.hg' is inside nested repo 'beans'
+  abort: path 'beans/.hg' is inside nested repo 'beans' (glob)
   [255]
 
 Test absolute paths:
@@ -227,7 +223,6 @@
   f  fennel      fennel
   f  fenugreek   fenugreek
   f  fiddlehead  fiddlehead
-  f  glob:glob   glob:glob
 
   $ hg debugwalk 'glob:**e'
   f  beans/turtle                    beans/turtle
@@ -236,7 +231,6 @@
   $ hg debugwalk 're:.*[kb]$'
   f  beans/black    beans/black
   f  fenugreek      fenugreek
-  f  glob:glob      glob:glob
   f  mammals/skunk  mammals/skunk
 
   $ hg debugwalk path:beans/black
@@ -276,9 +270,11 @@
   $ hg debugwalk NOEXIST
   NOEXIST: * (glob)
 
+#if fifo
   $ mkfifo fifo
   $ hg debugwalk fifo
   fifo: unsupported file type (type is fifo)
+#endif
 
   $ rm fenugreek
   $ hg debugwalk fenugreek
@@ -298,13 +294,19 @@
   f  ignored/file  ignored/file  exact
 
 Test listfile and listfile0
+(arguments 'foo:../bar' are mangled by MSYS, so we do these in Python)
 
   $ python -c "file('../listfile0', 'wb').write('fenugreek\0new\0')"
-  $ hg debugwalk -I 'listfile0:../listfile0'
+
+  >>> from mercurial.dispatch import request, dispatch
+  >>> dispatch(request(['debugwalk', '-I', 'listfile0:../listfile0']))
   f  fenugreek  fenugreek
   f  new        new
+
   $ python -c "file('../listfile', 'wb').write('fenugreek\nnew\r\nmammals/skunk\n')"
-  $ hg debugwalk -I 'listfile:../listfile'
+
+  >>> from mercurial.dispatch import request, dispatch
+  >>> dispatch(request(['debugwalk', '-I', 'listfile:../listfile']))
   f  fenugreek      fenugreek
   f  mammals/skunk  mammals/skunk
   f  new            new