diff options
| author |  Jeff King <peff@peff.net> | 2017-10-03 09:42:15 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-10-04 11:32:56 +0900 |
| commit | 8552972b133ee5147f3af11ab21cf4b1d04e97e5 (patch) | |
| tree | 4f59dc49251c213e1c3c0f0c89dfc5bcc01e7341 | |
| parent | t4015: prefer --color to -c color.diff=always (diff) | |
| download | tgif-8552972b133ee5147f3af11ab21cf4b1d04e97e5.tar.xz | |
t3701: use test-terminal to collect color output
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3701-add-interactive.sh | 8 |
1 files 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. |