Mercurial > hg-stable
changeset 35215:8feef8ef8389
tests: trivial fixes for Windows
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 02 Dec 2017 17:52:53 -0500 |
| parents | d4b108fdf423 |
| children | 278f1feee73a |
| files | tests/test-dispatch.t tests/test-status-color.t |
| diffstat | 2 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-dispatch.t Wed Nov 29 08:40:25 2017 +0530 +++ b/tests/test-dispatch.t Sat Dec 02 17:52:53 2017 -0500 @@ -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'
--- a/tests/test-status-color.t Wed Nov 29 08:40:25 2017 +0530 +++ b/tests/test-status-color.t Sat Dec 02 17:52:53 2017 -0500 @@ -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