From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Sebastian Celis <sebastian@sebastiancelis.com>, git@vger.kernel.org
Subject: [PATCH v2 6/6] tests: Add tests for automatic use of pager
Date: Sun, 14 Feb 2010 23:35:21 -0600 [thread overview]
Message-ID: <20100215053521.GA22121@progeny.tock> (raw)
In-Reply-To: <20100215051016.GF3336@coredump.intra.peff.net>
Git’s automatic pagination support has some subtleties; add some tests
to make sure they don’t break again.
These test:
- when git will use a pager by default;
- the effect of the --paginate and --no-pager options;
- the effect of pagination on use of color;
- how the choice of pager is configured.
They does not yet test:
- use of pager by scripted commands (git svn and git am);
- effect of the pager.* configuration variables;
- setting of the LESS variable.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Jeff King wrote:
> I am a little lukewarm on tests that require --verbose, since they will
> not be caught by 99% of the runs of the test suite.
Makes sense.
> Still, perhaps something is better than nothing. I wonder if we can do
> better, though, with something like:
[...]
> if (fake[fd] == -1) {
> const char *x = getenv("GIT_PRETEND_TTY");
> if (x && strchr(x, '0' + fd))
> fake[fd] = 1;
> else
> fake[fd] = isatty(fd);
How about this? It seems a little simpler, though it might be less
reliable.
| 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 156 insertions(+), 0 deletions(-)
create mode 100644 t/t7006-pager.sh
--git a/t/t7006-pager.sh b/t/t7006-pager.sh
new file mode 100644
index 0000000..458a754
--- /dev/null
+++ b/t/t7006-pager.sh
@@ -0,0 +1,156 @@
+#!/bin/sh
+
+test_description='Test automatic use of a pager.'
+
+. ./test-lib.sh
+
+if eval "exec 8>/dev/tty" 2>/dev/null && test -t 8
+then
+ test_set_prereq TTY
+else
+ say no usable /dev/tty, so skipping some tests.
+ exec 8>&-
+fi
+
+unset GIT_PAGER GIT_PAGER_IN_USE
+git config --unset core.pager
+PAGER='cat > paginated.out'
+export PAGER
+
+test_expect_success 'setup' '
+ test_commit initial
+'
+
+rm -f paginated.out
+test_expect_success TTY 'some commands use a pager' '
+ git log -0 >&8 &&
+ test -e paginated.out
+'
+
+rm -f paginated.out
+test_expect_success TTY 'some commands do not use a pager' '
+ git rev-list -0 HEAD >&8 &&
+ ! test -e paginated.out
+'
+
+rm -f paginated.out
+test_expect_success 'no pager when stdout is a pipe' '
+ git log | cat &&
+ ! test -e paginated.out
+'
+
+rm -f paginated.out
+test_expect_success 'no pager when stdout is a regular file' '
+ git log > file &&
+ ! test -e paginated.out
+'
+
+rm -f paginated.out
+test_expect_success TTY 'git --paginate rev-list uses a pager' '
+ git --paginate rev-list -0 HEAD >&8 &&
+ test -e paginated.out
+'
+
+rm -f file paginated.out
+test_expect_success 'no pager even with --paginate when stdout is a pipe' '
+ git --paginate log | cat &&
+ ! test -e paginated.out
+'
+
+rm -f paginated.out
+test_expect_success TTY 'no pager with --no-pager' '
+ git --no-pager log -0 >&8 &&
+ ! test -e paginated.out
+'
+
+# A colored commit log will begin with an appropriate ANSI escape
+# for the first color; the text "commit" comes later.
+colorful() {
+ read firstline < $1
+ ! expr "$firstline" : "^[a-zA-Z]" >/dev/null
+}
+
+rm -f colorful.log colorless.log
+test_expect_success 'tests can detect color' '
+ git log --no-color > colorless.log &&
+ git log --color > colorful.log &&
+ ! colorful colorless.log &&
+ colorful colorful.log
+'
+
+rm -f colorless.log
+git config color.ui auto
+test_expect_success 'no color when stdout is a regular file' '
+ git log > colorless.log &&
+ ! colorful colorless.log
+'
+
+rm -f paginated.out
+git config color.ui auto
+test_expect_success TTY 'color when writing to a pager' '
+ TERM=vt100 git log >&8 &&
+ colorful paginated.out
+'
+
+rm -f colorful.log
+git config color.ui auto
+test_expect_success 'color when writing to a file intended for a pager' '
+ TERM=vt100 GIT_PAGER_IN_USE=true git log > colorful.log &&
+ colorful colorful.log
+'
+
+unset PAGER GIT_PAGER
+git config --unset core.pager
+test_expect_success 'determine default pager' '
+ less=$(git var GIT_PAGER) &&
+ test -n "$less"
+'
+
+if expr "$less" : '^[a-z]*$' > /dev/null && test_have_prereq TTY
+then
+ test_set_prereq SIMPLEPAGER
+fi
+
+unset PAGER GIT_PAGER
+git config --unset core.pager
+rm -f default_pager_used
+test_expect_success SIMPLEPAGER 'default pager is used by default' '
+ cat > $less <<-EOF &&
+ #!$SHELL_PATH
+ : > default_pager_used
+ EOF
+ chmod +x $less &&
+ PATH=.:$PATH git log -0 >&8 &&
+ test -e default_pager_used
+'
+
+unset GIT_PAGER
+git config --unset core.pager
+rm -f PAGER_used
+test_expect_success TTY 'PAGER overrides default pager' '
+ PAGER=": > PAGER_used" &&
+ export PAGER &&
+ git log -0 >&8 &&
+ test -e PAGER_used
+'
+
+unset GIT_PAGER
+rm -f core.pager_used
+test_expect_success TTY 'core.pager overrides PAGER' '
+ PAGER=: &&
+ export PAGER &&
+ git config core.pager ": > core.pager_used" &&
+ git log -0 >&8 &&
+ test -e core.pager_used
+'
+
+rm -f GIT_PAGER_used
+test_expect_success TTY 'GIT_PAGER overrides core.pager' '
+ git config core.pager : &&
+ GIT_PAGER=": > GIT_PAGER_used" &&
+ export GIT_PAGER &&
+ git log -0 >&8 &&
+ test -e GIT_PAGER_used
+'
+
+test_done
--
1.7.0
next prev parent reply other threads:[~2010-02-15 5:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-13 21:14 'git svn log' no longer uses the pager Sebastian Celis
2010-02-13 23:51 ` Jeff King
2010-02-14 11:54 ` Jonathan Nieder
2010-02-14 11:55 ` [PATCH 1/6] Fix 'git var' usage synopsis Jonathan Nieder
2010-02-15 2:22 ` Junio C Hamano
2010-02-15 2:36 ` [PATCH v2 " Jonathan Nieder
2010-02-15 4:47 ` Jeff King
2010-02-14 11:59 ` [PATCH 2/6] Make 'git var GIT_PAGER' always print the configured pager Jonathan Nieder
2010-02-15 5:00 ` Jeff King
2010-02-15 5:44 ` Jonathan Nieder
2010-02-15 7:57 ` Jeff King
2010-02-14 12:02 ` [PATCH 3/6] git.1: Clarify the behavior of the --paginate option Jonathan Nieder
2010-02-15 4:55 ` Jeff King
2010-02-14 12:06 ` [PATCH 4/6] git svn: Fix launching of pager Jonathan Nieder
2010-02-15 7:58 ` Eric Wong
2010-02-14 12:07 ` [PATCH 5/6] am: " Jonathan Nieder
2010-02-15 2:30 ` Junio C Hamano
2010-02-15 2:59 ` [PATCH v2 " Jonathan Nieder
2010-02-15 3:25 ` [PATCH v3 " Jonathan Nieder
2010-02-15 4:42 ` Jeff King
2010-02-15 5:04 ` [PATCH v4 " Jonathan Nieder
2010-02-15 5:12 ` Jeff King
2010-02-15 20:26 ` Johannes Sixt
2010-02-14 12:13 ` [PATCH 6/6] tests: Add tests for automatic use " Jonathan Nieder
2010-02-15 5:10 ` Jeff King
2010-02-15 5:35 ` Jonathan Nieder [this message]
2010-02-15 5:37 ` [PATCH v2 " Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100215053521.GA22121@progeny.tock \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sebastian@sebastiancelis.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.
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 NNTP newsgroup(s).