From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Toni Uebernickel <tuebernickel@gmail.com>,
git@vger.kernel.org, Tsvi Mostovicz <ttmost@gmail.com>
Subject: [PATCH 04/12] t3701: use test-terminal to collect color output
Date: Tue, 3 Oct 2017 09:42:15 -0400 [thread overview]
Message-ID: <20171003134215.oce7bdemb7cjyg22@sigill.intra.peff.net> (raw)
In-Reply-To: <20171003133713.ccxv6clrmuuhhc3u@sigill.intra.peff.net>
When testing whether "add -p" can generate colors, we set
color.ui to "always". This isn't a very good test, as in the
real-world a user typically has "auto" coupled with stdout
going to a terminal (and it's plausible that this could mask
a real bug in add--interactive if we depend on plumbing's
isatty check).
Let's switch to test_terminal, which gives us a more
realistic environment. This also prepare us for future
changes to the "always" color option.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t3701-add-interactive.sh | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 2f3e7cea64..39d0130f88 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -2,6 +2,7 @@
test_description='add -i basic tests'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
if ! test_have_prereq PERL
then
@@ -380,14 +381,11 @@ test_expect_success 'patch mode ignores unmerged entries' '
test_cmp expected diff
'
-test_expect_success 'diffs can be colorized' '
+test_expect_success TTY 'diffs can be colorized' '
git reset --hard &&
- # force color even though the test script has no terminal
- test_config color.ui always &&
-
echo content >test &&
- printf y | git add -p >output 2>&1 &&
+ printf y | test_terminal git add -p >output 2>&1 &&
# We do not want to depend on the exact coloring scheme
# git uses for diffs, so just check that we saw some kind of color.
--
2.14.2.1079.gce6b466188
next prev parent reply other threads:[~2017-10-03 13:42 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 13:23 Updated to v2.14.2 on macOS; git add --patch broken Toni Uebernickel
2017-09-27 17:07 ` Jeff King
2017-09-27 17:28 ` Toni Uebernickel
2017-09-27 18:01 ` Jeff King
2017-09-27 19:51 ` Jonathan Nieder
2017-09-27 19:53 ` Jonathan Nieder
2017-09-28 5:03 ` Toni Uebernickel
2017-09-28 5:20 ` Jeff King
2017-09-28 5:31 ` Toni Uebernickel
2017-10-02 23:00 ` Jonathan Nieder
2017-10-03 1:18 ` Junio C Hamano
2017-10-03 2:25 ` Junio C Hamano
2017-10-03 3:14 ` Junio C Hamano
2017-10-03 6:15 ` Jeff King
2017-10-03 7:10 ` Junio C Hamano
2017-10-03 7:16 ` Jeff King
2017-10-03 8:34 ` Junio C Hamano
2017-10-03 8:45 ` Jeff King
2017-10-03 8:56 ` Junio C Hamano
2017-10-03 9:10 ` Jeff King
2017-10-03 9:18 ` Tsvi Mostovicz
2017-10-03 10:38 ` Junio C Hamano
2017-10-03 13:37 ` Jeff King
2017-10-03 13:39 ` [PATCH 01/12] test-terminal: set TERM=vt100 Jeff King
2017-10-03 13:40 ` [PATCH 02/12] t4015: prefer --color to -c color.diff=always Jeff King
2017-10-03 13:41 ` [PATCH 03/12] t4015: use --color with --color-moved Jeff King
2017-10-03 13:42 ` Jeff King [this message]
2017-10-03 13:43 ` [PATCH 05/12] t7508: use test_terminal for color output Jeff King
2017-10-03 13:43 ` [PATCH 06/12] t7502: use diff.noprefix for --verbose test Jeff King
2017-10-03 13:44 ` [PATCH 07/12] t6006: drop "always" color config tests Jeff King
2017-10-03 13:44 ` [PATCH 08/12] t3203: drop "always" color test Jeff King
2017-10-03 13:44 ` [PATCH 09/12] t7301: use test_terminal to check color Jeff King
2017-10-03 13:45 ` [PATCH 10/12] t3205: use --color instead of color.branch=always Jeff King
2017-10-03 13:45 ` [PATCH 11/12] provide --color option for all ref-filter users Jeff King
2017-10-03 13:46 ` [PATCH 12/12] color: make "always" the same as "auto" in config Jeff King
2017-10-04 2:59 ` Updated to v2.14.2 on macOS; git add --patch broken Junio C Hamano
2017-10-05 10:06 ` Jeff King
2017-10-20 13:31 ` Jan Prachař
2017-10-03 9:31 ` Jeff King
2017-10-03 4:07 ` [PATCH 0/2] fixing "add -p" regression Junio C Hamano
2017-10-03 4:07 ` [PATCH 1/2] Revert "color: check color.ui in git_default_config()" Junio C Hamano
2017-10-03 4:07 ` [PATCH 2/2] colors: git_default_config() does not read color.ui Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171003134215.oce7bdemb7cjyg22@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=ttmost@gmail.com \
--cc=tuebernickel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).