From: Jonathan Nieder Date: Mon, 16 Aug 2010 08:08:34 +0000 (-0500) Subject: t7006 (pager): add missing TTY prerequisites X-Git-Tag: v1.7.3-rc0~33^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd;p=git.git t7006 (pager): add missing TTY prerequisites The "git bundle unbundle" and "git config" pagination tests are not supposed to run when stdout is not a terminal and IO::Pty not available to make one on the fly. Reported-by: Thomas Rast Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 017565f33..fb744e3c4 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -134,7 +134,7 @@ test_expect_success TTY 'configuration can disable pager' ' ! test -e paginated.out ' -test_expect_success 'git config uses a pager if configured to' ' +test_expect_success TTY 'git config uses a pager if configured to' ' rm -f paginated.out && git config pager.config true && test_when_finished "git config --unset pager.config" && @@ -142,7 +142,7 @@ test_expect_success 'git config uses a pager if configured to' ' test -e paginated.out ' -test_expect_success 'configuration can enable pager (from subdir)' ' +test_expect_success TTY 'configuration can enable pager (from subdir)' ' rm -f paginated.out && mkdir -p subdir && git config pager.bundle true &&