[PATCH 01 of 11 STABLE] tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Mon Oct 20 13:26:55 UTC 2014
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1413810488 -32400
# Mon Oct 20 22:08:08 2014 +0900
# Branch stable
# Node ID ef382dbe8c20ee19e984ed26c8c46f93e50bf229
# Parent c1ae0b2c1719f56b906472efea8b20ca0774c968
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
diff --git a/tests/test-record.t b/tests/test-record.t
--- a/tests/test-record.t
+++ b/tests/test-record.t
@@ -963,12 +963,14 @@ Mock "Preserve chmod +x"
> 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 @@ Mock "Preserve execute permission on ori
> 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 @@ Mock "Preserve chmod -x"
> 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
More information about the Mercurial-devel
mailing list