Mercurial > hg-stable
changeset 23054:40c01f95449b stable
tests: adjust expected prompt choice outputs in test-record.t for Windows
Changeset 9ab18a912c44 introduced "showing prompt choice if input is
not a tty but is forced to be interactive" and adjusted expected
output in test-record.t.
But some tests for no-execbit platform (= Windows) were not adjusted
by 9ab18a912c44.
This causes unexpected failure of test-record on Windows environment.
This patch adds below to prompt lines for such tests:
- prompt choice at the end of prompt line, and
- empty line after prompt line
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 20 Oct 2014 22:08:08 +0900 |
parents | 5ba11ab48fcf |
children | 392ed77879c3 |
files | tests/test-record.t |
diffstat | 1 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-record.t Tue Oct 21 23:16:46 2014 +0900 +++ b/tests/test-record.t Mon Oct 20 22:08:08 2014 +0900 @@ -963,12 +963,14 @@ > EOF diff --git a/subdir/f1 b/subdir/f1 1 hunks, 1 lines changed - examine changes to 'subdir/f1'? [Ynesfdaq?] + examine changes to 'subdir/f1'? [Ynesfdaq?] y + @@ -1,2 +1,3 @@ a a +a - record this change to 'subdir/f1'? [Ynesfdaq?] + record this change to 'subdir/f1'? [Ynesfdaq?] y + $ hg tip --config diff.git=True -p changeset: 22:0d463bd428f5 @@ -996,13 +998,15 @@ > EOF diff --git a/subdir/f1 b/subdir/f1 1 hunks, 1 lines changed - examine changes to 'subdir/f1'? [Ynesfdaq?] + examine changes to 'subdir/f1'? [Ynesfdaq?] y + @@ -1,3 +1,4 @@ a a a +b - record this change to 'subdir/f1'? [Ynesfdaq?] + record this change to 'subdir/f1'? [Ynesfdaq?] y + $ hg tip --config diff.git=True -p changeset: 23:0eab41a3e524 @@ -1032,13 +1036,15 @@ > EOF diff --git a/subdir/f1 b/subdir/f1 1 hunks, 1 lines changed - examine changes to 'subdir/f1'? [Ynesfdaq?] + examine changes to 'subdir/f1'? [Ynesfdaq?] y + @@ -2,3 +2,4 @@ a a b +c - record this change to 'subdir/f1'? [Ynesfdaq?] + record this change to 'subdir/f1'? [Ynesfdaq?] y + $ hg tip --config diff.git=True -p changeset: 24:f4f718f27b7c