debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: drop the implicit prereq check mechanism from test_expect_*

Browse source 
The only place where we use the implicit prereq check is T000-basic.sh
where we check that it works. It's an added complication that we don't
use. Remove it.

The test_have_prereq function can still be used for the same effect in
subtests that use test_begin_subtest. For now, this will make it
impossible to have prereqs in one-line subtests that don't require
test_begin_subtest. This will be fixed in follow-up work.
This commit is contained in:
Jani Nikula 2017-02-26 15:42:59 +02:00 committed by David Bremner
parent e563b8cafd
commit b8f12bd371
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/T000-basic.sh
View file

@ -23,7 +23,7 @@ test_expect_success 'success is reported like this' '
' '
test_set_prereq HAVEIT test_set_prereq HAVEIT
haveit=no haveit=no
test_expect_success HAVEIT 'test runs if prerequisite is satisfied' ' test_expect_success 'test runs if prerequisite is satisfied' '
test_have_prereq HAVEIT && test_have_prereq HAVEIT &&
haveit=yes haveit=yes
' '

26
test/test-lib.sh
View file

@ -563,9 +563,8 @@ test_expect_equal ()
error "bug in the test script: test_expect_equal without test_begin_subtest" error "bug in the test script: test_expect_equal without test_begin_subtest"
fi fi
inside_subtest= inside_subtest=
test "$#" = 3 && { prereq=$1; shift; } || prereq=
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test_expect_equal" error "bug in the test script: not 2 parameters to test_expect_equal"
output="$1" output="$1"
expected="$2" expected="$2"
@ -590,9 +589,8 @@ test_expect_equal_file ()
error "bug in the test script: test_expect_equal_file without test_begin_subtest" error "bug in the test script: test_expect_equal_file without test_begin_subtest"
fi fi
inside_subtest= inside_subtest=
test "$#" = 3 && { prereq=$1; shift; } || prereq=
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test_expect_equal" error "bug in the test script: not 2 parameters to test_expect_equal_file"
file1="$1" file1="$1"
file2="$2" file2="$2"
@ -633,9 +631,8 @@ test_sort_json () {
} }
test_emacs_expect_t () { test_emacs_expect_t () {
test "$#" = 2 && { prereq=$1; shift; } || prereq=
test "$#" = 1 || test "$#" = 1 ||
error "bug in the test script: not 1 or 2 parameters to test_emacs_expect_t" error "bug in the test script: not 1 parameter to test_emacs_expect_t"
if [ -z "$inside_subtest" ]; then if [ -z "$inside_subtest" ]; then
error "bug in the test script: test_emacs_expect_t without test_begin_subtest" error "bug in the test script: test_emacs_expect_t without test_begin_subtest"
fi fi
@ -750,12 +747,8 @@ notmuch_config_sanitize ()
# End of notmuch helper functions # End of notmuch helper functions
# Use test_set_prereq to tell that a particular prerequisite is available. # Use test_set_prereq to tell that a particular prerequisite is available.
# The prerequisite can later be checked for in two ways:
# #
# - Explicitly using test_have_prereq. # The prerequisite can later be checked for by using test_have_prereq.
#
# - Implicitly by specifying the prerequisite tag in the calls to
# test_expect_{success,failure,code}.
# #
# The single parameter is the prerequisite tag (a simple word, in all # The single parameter is the prerequisite tag (a simple word, in all
# capital letters by convention). # capital letters by convention).
@ -890,11 +883,6 @@ test_skip () {
break break
esac esac
done done
if test -z "$to_skip" && test -n "$prereq" &&
! test_have_prereq "$prereq"
then
to_skip=t
fi
case "$to_skip" in case "$to_skip" in
t) t)
test_report_skip_ "$@" test_report_skip_ "$@"
@ -928,9 +916,8 @@ test_subtest_known_broken () {
} }
test_expect_success () { test_expect_success () {
test "$#" = 3 && { prereq=$1; shift; } || prereq=
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-success" error "bug in the test script: not 2 parameters to test_expect_success"
test_subtest_name="$1" test_subtest_name="$1"
test_reset_state_ test_reset_state_
if ! test_skip "$@" if ! test_skip "$@"
@ -949,9 +936,8 @@ test_expect_success () {
} }
test_expect_code () { test_expect_code () {
test "$#" = 4 && { prereq=$1; shift; } || prereq=
test "$#" = 3 || test "$#" = 3 ||
error "bug in the test script: not 3 or 4 parameters to test-expect-code" error "bug in the test script: not 3 parameters to test_expect_code"
test_subtest_name="$2" test_subtest_name="$2"
test_reset_state_ test_reset_state_
if ! test_skip "$@" if ! test_skip "$@"