Patchwork [1,of,5] tests: trivial fixes for Windows

login
register
mail settings
Submitter Matt Harbison
Date Dec. 3, 2017, 6:54 a.m.
Message ID <c65000767eec5a1a159c.1512284094@Envy>
Download mbox | patch
Permalink /patch/25905/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 3, 2017, 6:54 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1512255173 18000
#      Sat Dec 02 17:52:53 2017 -0500
# Node ID c65000767eec5a1a159c73cd2fe7b6741a1dea84
# Parent  bfd072c52e03cc14bd2b36bd982c15b5029e6fa8
tests: trivial fixes for Windows
Yuya Nishihara - Dec. 3, 2017, 8:55 a.m.
On Sun, 03 Dec 2017 01:54:54 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1512255173 18000
> #      Sat Dec 02 17:52:53 2017 -0500
> # Node ID c65000767eec5a1a159c73cd2fe7b6741a1dea84
> # Parent  bfd072c52e03cc14bd2b36bd982c15b5029e6fa8
> tests: trivial fixes for Windows

Queued this first patch, thanks.

Patch

diff --git a/tests/test-dispatch.t b/tests/test-dispatch.t
--- a/tests/test-dispatch.t
+++ b/tests/test-dispatch.t
@@ -83,11 +83,12 @@ 
   $ mkdir -p badrepo/.hg
   $ echo 'invalid-syntax' > badrepo/.hg/hgrc
   $ hg log -b -Rbadrepo default
-  hg: parse error at badrepo/.hg/hgrc:1: invalid-syntax
+  hg: parse error at badrepo/.hg/hgrc:1: invalid-syntax (glob)
   [255]
 
   $ hg log -b --cwd=inexistent default
-  abort: No such file or directory: 'inexistent'
+  abort: No such file or directory: 'inexistent' (no-windows !)
+  abort: The system cannot find the file specified: 'inexistent' (windows !)
   [255]
 
   $ hg log -b '--config=ui.traceback=yes' 2>&1 | grep '^Traceback'
diff --git a/tests/test-status-color.t b/tests/test-status-color.t
--- a/tests/test-status-color.t
+++ b/tests/test-status-color.t
@@ -31,19 +31,19 @@ 
   [status.unknown|? ][status.unknown|in_root]
 HGPLAIN disables color
   $ HGPLAIN=1 hg status --color=debug
-  ? a/1/in_a_1
-  ? a/in_a
-  ? b/1/in_b_1
-  ? b/2/in_b_2
-  ? b/in_b
+  ? a/1/in_a_1 (glob)
+  ? a/in_a (glob)
+  ? b/1/in_b_1 (glob)
+  ? b/2/in_b_2 (glob)
+  ? b/in_b (glob)
   ? in_root
 HGPLAINEXCEPT=color does not disable color
   $ HGPLAINEXCEPT=color hg status --color=debug
-  [status.unknown|? ][status.unknown|a/1/in_a_1]
-  [status.unknown|? ][status.unknown|a/in_a]
-  [status.unknown|? ][status.unknown|b/1/in_b_1]
-  [status.unknown|? ][status.unknown|b/2/in_b_2]
-  [status.unknown|? ][status.unknown|b/in_b]
+  [status.unknown|? ][status.unknown|a/1/in_a_1] (glob)
+  [status.unknown|? ][status.unknown|a/in_a] (glob)
+  [status.unknown|? ][status.unknown|b/1/in_b_1] (glob)
+  [status.unknown|? ][status.unknown|b/2/in_b_2] (glob)
+  [status.unknown|? ][status.unknown|b/in_b] (glob)
   [status.unknown|? ][status.unknown|in_root]
 
 hg status with template