summaryrefslogtreecommitdiff
path: root/t/t7006-pager.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-16 08:08:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-16 16:41:26 (GMT)
commit41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd (patch)
tree5f9da0d07fb04aa48b45a4e674c42a8fed03db93 /t/t7006-pager.sh
parent3668d4238314dc5db98de3034058f68ff57a6b1e (diff)
downloadgit-41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd.zip
git-41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd.tar.gz
git-41bf3bc232cf5f99fdc6d3d729536a4c4821d3bd.tar.bz2
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 <trast@student.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7006-pager.sh')
-rwxr-xr-xt/t7006-pager.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 017565f..fb744e3 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 &&