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

Re: tr/pty-all (Re: What's cooking in git.git (Dec 2011, #04; Tue, 13))

From
Jeff King <peff@peff.net>
Date
Dec 15, 2011, 06:55 UTC
Message-ID
<20111215065529.GA1327@sigill.intra.peff.net>
In-Reply-To
<7vfwgmplgd.fsf@alter.siamese.dyndns.org>
On Wed, Dec 14, 2011 at 07:23:14PM -0800, Junio C Hamano wrote:
Show 7 quoted lines
> Jeff King <peff@peff.net> writes:
> 
> > This correctly detects the bug in t7006. I can't decide if it's clever
> > or ugly.
> 
> I would say it falls on the latter side of the line by small margin. Let's
> do the /dev/null thing and be done with it.
Darn, I wanted to post it on my fridge with an "A+".
Here's a cleaned-up version of the /dev/null one.
-- >8 --
Subject: [PATCH] test-lib: redirect stdin of tests

We want to run tests in a predictable, sterile environment so we can get repeatable results. They should take as little input as possible from the environment outside the test script. We already sanitize environment variables, but leave stdin untouched. This means that scripts can accidentally be impacted by content on stdin, or whether stdin isatty().

Furthermore, scripts reading from stdin can be annoying to outer loops which care about their stdin offset, like:

  while read sha1; do
      make test
  done

A test which accidentally reads stdin would soak up all of the rest of the input intended for the outer shell loop.

Let's redirect stdin from /dev/null, which solves both of these problems. It won't detect tests accidentally reading from stdin, but since doing so now gives a deterministic result, we don't need to consider that an error.

We'll also leave file descriptor 6 as a link to the original stdin. Tests shouldn't need to look at this, but it can be convenient for inserting interactive commands while debugging tests (e.g., you could insert "bash <&6 >&3 2>&4" to run interactive commands in the environment of the test script).

Signed-off-by: Jeff King <peff@peff.net>
---
I went the "redirect each test individually" route. In the course of my
experimentation, I notice that some tests (e.g., t4013) will do:
  while read x; do
          test_expect_success "test something ($x)" "
            ... do some test involving $x ...
          "
  done <<\EOF
  ... some values of $x ....
  EOF

This protects those loops from accidental stdin-readers inside the test scripts, too.

 t/test-lib.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index bdd9513..5ea9fe3 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -191,6 +191,7 @@ then
 fi
 
 exec 5>&1
+exec 6<&0
 if test "$verbose" = "t"
 then
 	exec 4>&2 3>&1
@@ -469,7 +470,7 @@ test_debug () {
 test_eval_ () {
 	# This is a separate function because some tests use
 	# "return" to end a test_expect_success block early.
-	eval >&3 2>&4 "$*"
+	eval </dev/null >&3 2>&4 "$*"
 }
 
 test_run_ () {
-- 
1.7.8.rc2.30.g803b1a
Previous: Junio C HamanoNext: Junio C Hamano
Message 11 of 12 in “What's cooking in git.git (Dec 2011, #04; Tue, 13)”
  1. Junio C HamanoDec 14, 2011
  2. tr/pty-all (Re: What's cooking in git.git (Dec 2011, #04; Tue, 13))Jonathan Nieder, Dec 14, 2011
  3. Thomas RastDec 14, 2011
  4. Junio C HamanoDec 14, 2011
  5. Jeff KingDec 14, 2011
  6. Jeff KingDec 14, 2011
  7. Jonathan NiederDec 14, 2011
  8. Jeff KingDec 15, 2011
  9. Jeff KingDec 15, 2011
  10. Junio C HamanoDec 15, 2011
  11. Jeff KingDec 15, 2011
  12. Junio C HamanoDec 15, 2011

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.