git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 6/6] tests: Add tests for automatic use of pager

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Feb 15, 2010, 05:35 UTC
Message-ID
<20100215053521.GA22121@progeny.tock>
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:
[...]
Show 6 quoted lines
>     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.

 t/t7006-pager.sh |  156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 156 insertions(+), 0 deletions(-)
 create mode 100644 t/t7006-pager.sh
diff --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
Previous: Jeff KingNext: Jeff King
Message 26 of 27 in “'git svn log' no longer uses the pager”
  1. Sebastian CelisFeb 13, 2010
  2. Jeff KingFeb 13, 2010
  3. Jonathan NiederFeb 14, 2010
  4. 1/6 Fix 'git var' usage synopsisJonathan Nieder, Feb 14, 2010
  5. Junio C HamanoFeb 15, 2010
  6. 1/6 Fix 'git var' usage synopsisJonathan Nieder, Feb 15, 2010
  7. Jeff KingFeb 15, 2010
  8. 2/6 Make 'git var GIT_PAGER' always print the configured pagerJonathan Nieder, Feb 14, 2010
  9. Jeff KingFeb 15, 2010
  10. Jonathan NiederFeb 15, 2010
  11. Jeff KingFeb 15, 2010
  12. 3/6 git.1: Clarify the behavior of the --paginate optionJonathan Nieder, Feb 14, 2010
  13. Jeff KingFeb 15, 2010
  14. 4/6 git svn: Fix launching of pagerJonathan Nieder, Feb 14, 2010
  15. Eric WongFeb 15, 2010
  16. 5/6 am: Fix launching of pagerJonathan Nieder, Feb 14, 2010
  17. Junio C HamanoFeb 15, 2010
  18. 5/6 am: Fix launching of pagerJonathan Nieder, Feb 15, 2010
  19. 5/6 am: Fix launching of pagerJonathan Nieder, Feb 15, 2010
  20. Jeff KingFeb 15, 2010
  21. 5/6 am: Fix launching of pagerJonathan Nieder, Feb 15, 2010
  22. Jeff KingFeb 15, 2010
  23. Johannes SixtFeb 15, 2010
  24. 6/6 tests: Add tests for automatic use of pagerJonathan Nieder, Feb 14, 2010
  25. Jeff KingFeb 15, 2010
  26. 6/6 tests: Add tests for automatic use of pagerJonathan Nieder, Feb 15, 2010
  27. Jeff KingFeb 15, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.