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

implement test_might_fail using a refactored test_must_fail

Browse Source 
Add an (optional) first parameter "ok=<special case>" to test_must_fail
and return success for "<special case>". Add "success" as
"<special case>" and use it to implement "test_might_fail". This removes
redundancies in test-lib-function.sh.

You can pass multiple <special case> arguments divided by comma (e.g.
"test_must_fail ok=success,something")

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Lars Schneider 2015-11-27 10:15:13 +01:00 committed by Jeff King
parent 0c83680e9c
commit bbfe5302d5
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,6 +569,21 @@ test_line_count () {
fi fi
} }
# Returns success if a comma separated string of keywords ($1) contains a
# given keyword ($2).
# Examples:
# `list_contains "foo,bar" bar` returns 0
# `list_contains "foo" bar` returns 1
list_contains () {
case ",$1," in
*,$2,*)
return 0
;;
esac
return 1
}
# This is not among top-level (test_expect_success | test_expect_failure) # This is not among top-level (test_expect_success | test_expect_failure)
# but is a prefix that can be used in the test script, like: # but is a prefix that can be used in the test script, like:
# #
@ -582,18 +597,31 @@ test_line_count () {
# the failure could be due to a segv. We want a controlled failure. # the failure could be due to a segv. We want a controlled failure.
test_must_fail () { test_must_fail () {
case "$1" in
ok=*)
_test_ok=${1#ok=}
shift
;;
*)
_test_ok=
;;
esac
"$@" "$@"
exit_code=$? exit_code=$?
if test $exit_code = 0; then if test $exit_code -eq 0 && ! list_contains "$_test_ok" success
then
echo >&2 "test_must_fail: command succeeded: $*" echo >&2 "test_must_fail: command succeeded: $*"
return 1 return 1
elif test $exit_code -gt 129 && test $exit_code -le 192; then elif test $exit_code -gt 129 && test $exit_code -le 192
then
echo >&2 "test_must_fail: died by signal: $*" echo >&2 "test_must_fail: died by signal: $*"
return 1 return 1
elif test $exit_code = 127; then elif test $exit_code -eq 127
then
echo >&2 "test_must_fail: command not found: $*" echo >&2 "test_must_fail: command not found: $*"
return 1 return 1
elif test $exit_code = 126; then elif test $exit_code -eq 126
then
echo >&2 "test_must_fail: valgrind error: $*" echo >&2 "test_must_fail: valgrind error: $*"
return 1 return 1
fi fi
@ -612,16 +640,7 @@ 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 "$@"
exit_code=$?
if test $exit_code -gt 129 && test $exit_code -le 192; then
echo >&2 "test_might_fail: died by signal: $*"
return 1
elif test $exit_code = 127; then
echo >&2 "test_might_fail: command not found: $*"
return 1
fi
return 0
} }
# 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