undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t: prevent '-x' tracing from interfering with test helpers' stderr

Browse Source 
Running a test script with '-x' turns on 'set -x' tracing, the output
of which is normally sent to stderr.  This causes a lot of
test failures, because many tests redirect and verify the stderr
of shell functions, most frequently that of 'test_must_fail'.
These issues were worked around somewhat in d88785e424 (test-lib: set
BASH_XTRACEFD automatically, 2016-05-11), so at least we could
reliably run tests with '-x' tracing under a Bash version supporting
BASH_XTRACEFD, i.e. v4.1 and later.

Futhermore, redirecting the stderr of test helper functions like
'test_must_fail' or 'test_expect_code' is the cause of a different
issue as well.  If these functions detect something unexpected, they
will write their error messages intended to the user to thier stderr.
However, if their stderr is redirected in order to save and verify the
stderr of the tested git command invoked in the function, then the
function's error messages will be redirected as well.  Consequently,
those messages won't reach the user, making the test's verbose output
less useful.

This patch makes it safe to redirect and verify the stderr of those
test helper functions which are meant to run the tested command given
as argument, even when running tests with '-x' and /bin/sh.  This is
achieved through a couple of file descriptor redirections:

  - Duplicate stderr of the tested command executed in the test helper
    function from the function's fd 7 (see next point), to ensure that
    the tested command's error messages go to a different fd than the
    '-x' trace of the commands executed in the function or the
    function's error messages.

  - Duplicate the test helper function's fd 7 from the function's
    original stderr, meaning that, after taking a detour through fd 7,
    the error messages of the tested command do end up on the
    function's original stderr.

  - Duplicate stderr of the test helper function from fd 4, i.e. the
    fd connected to the test script's original stderr and the fd used
    for BASH_XTRACEFD.  This ensures that the '-x' trace of the
    commands executed in the function

      - doesn't go to the function's original stderr, so it won't mess
	with callers who want to save and verify the tested command's
	stderr.

      - does go to the same fd independently from the shell running
        the test script, be it /bin/sh, an older Bash without
        BASH_XTRACEFD, or a more recent Bash already supporting
        BASH_XTRACEFD.

    Furthermore, this also makes sure that the function's error
    messages go to this fd 4, meaning that the user will be able to
    see them even if the function's stderr is redirected in the test.

  - Specify the latter two redirections above in the test helper
    function's definition, so they are performed every time the
    function is invoked, without the need to modify the callsites of
    the function.

Perform these redirections in those test helper functions which can be
expected to have their stderr redirected, i.e. in the functions
'test_must_fail', 'test_might_fail', 'test_expect_code', 'test_env',
'nongit', 'test_terminal' and 'perl'.  Note that 'test_might_fail',
'test_env', and 'nongit' are not involved in any test failures when
running tests with '-x' and /bin/sh.

The other test helper functions are left unchanged, because they
either don't run commands specified as their arguments, or redirecting
their stderr wouldn't make sense, or both.

With this change the number of failures when running the test suite
with '-x' tracing and /bin/sh goes down from 340 failed tests in 43
test scripts to 22 failed tests in 6 scripts (or 23 in 7, if the
system (OSX) uses an older Bash version without BASH_XTRACEFD to run
't9903-bash-prompt.sh').

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2018-02-25 14:40:15 +01:00 committed by Junio C Hamano
parent e3a80781f5
commit a5bf824f3b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/lib-terminal.sh
View File

@ -9,8 +9,8 @@ test_terminal () {
echo >&4 "test_terminal: need to declare TTY prerequisite" echo >&4 "test_terminal: need to declare TTY prerequisite"
return 127 return 127
fi fi
perl "$TEST_DIRECTORY"/test-terminal.perl "$@" perl "$TEST_DIRECTORY"/test-terminal.perl "$@" 2>&7
} } 7>&2 2>&4
test_lazy_prereq TTY ' test_lazy_prereq TTY '
test_have_prereq PERL && test_have_prereq PERL &&

24
t/test-lib-functions.sh
View File

@ -621,7 +621,7 @@ test_must_fail () {
_test_ok= _test_ok=
;; ;;
esac esac
"$@" "$@" 2>&7
exit_code=$? exit_code=$?
if test $exit_code -eq 0 && ! list_contains "$_test_ok" success if test $exit_code -eq 0 && ! list_contains "$_test_ok" success
then then
@ -644,7 +644,7 @@ test_must_fail () {
return 1 return 1
fi fi
return 0 return 0
} } 7>&2 2>&4
# Similar to test_must_fail, but tolerates success, too. This is # Similar to test_must_fail, but tolerates success, too. This is
# meant to be used in contexts like: # meant to be used in contexts like:
@ -658,8 +658,8 @@ test_must_fail () {
# because we want to notice if it fails due to segv. # because we want to notice if it fails due to segv.
test_might_fail () { test_might_fail () {
test_must_fail ok=success "$@" test_must_fail ok=success "$@" 2>&7
} } 7>&2 2>&4
# Similar to test_must_fail and test_might_fail, but check that a # Similar to test_must_fail and test_might_fail, but check that a
# given command exited with a given exit code. Meant to be used as: # given command exited with a given exit code. Meant to be used as:
@ -671,7 +671,7 @@ test_might_fail () {
test_expect_code () { test_expect_code () {
want_code=$1 want_code=$1
shift shift
"$@" "$@" 2>&7
exit_code=$? exit_code=$?
if test $exit_code = $want_code if test $exit_code = $want_code
then then
@ -680,7 +680,7 @@ test_expect_code () {
echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*" echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*"
return 1 return 1
} } 7>&2 2>&4
# test_cmp is a helper function to compare actual and expected output. # test_cmp is a helper function to compare actual and expected output.
# You can use it like: # You can use it like:
@ -882,8 +882,8 @@ test_write_lines () {
} }
perl () { perl () {
command "$PERL_PATH" "$@" command "$PERL_PATH" "$@" 2>&7
} } 7>&2 2>&4
# Is the value one of the various ways to spell a boolean true/false? # Is the value one of the various ways to spell a boolean true/false?
test_normalize_bool () { test_normalize_bool () {
@ -1023,13 +1023,13 @@ test_env () {
shift shift
;; ;;
*) *)
"$@" "$@" 2>&7
exit exit
;; ;;
esac esac
done done
) )
} } 7>&2 2>&4
# Returns true if the numeric exit code in "$2" represents the expected signal # Returns true if the numeric exit code in "$2" represents the expected signal
# in "$1". Signals should be given numerically. # in "$1". Signals should be given numerically.
@ -1071,9 +1071,9 @@ nongit () {
GIT_CEILING_DIRECTORIES=$(pwd) && GIT_CEILING_DIRECTORIES=$(pwd) &&
export GIT_CEILING_DIRECTORIES && export GIT_CEILING_DIRECTORIES &&
cd non-repo && cd non-repo &&
"$@" "$@" 2>&7
) )
} } 7>&2 2>&4
# convert stdin to pktline representation; note that empty input becomes an # convert stdin to pktline representation; note that empty input becomes an
# empty packet, not a flush packet (for that you can just print 0000 yourself). # empty packet, not a flush packet (for that you can just print 0000 yourself).