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

test: ensure test_begin_subtest has been called before test_expect_*

Browse source 
This is the expectation, increase robustness of the test suite by
requiring it.
This commit is contained in:
Jani Nikula 2017-02-26 15:42:58 +02:00 committed by David Bremner
parent 13a59c4a8f
commit e563b8cafd
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/test-lib.sh
View file

@ -559,6 +559,9 @@ test_begin_subtest ()
test_expect_equal () test_expect_equal ()
{ {
exec 1>&6 2>&7 # Restore stdout and stderr exec 1>&6 2>&7 # Restore stdout and stderr
if [ -z "$inside_subtest" ]; then
error "bug in the test script: test_expect_equal without test_begin_subtest"
fi
inside_subtest= inside_subtest=
test "$#" = 3 && { prereq=$1; shift; } || prereq= test "$#" = 3 && { prereq=$1; shift; } || prereq=
test "$#" = 2 || test "$#" = 2 ||
@ -583,6 +586,9 @@ test_expect_equal ()
test_expect_equal_file () test_expect_equal_file ()
{ {
exec 1>&6 2>&7 # Restore stdout and stderr exec 1>&6 2>&7 # Restore stdout and stderr
if [ -z "$inside_subtest" ]; then
error "bug in the test script: test_expect_equal_file without test_begin_subtest"
fi
inside_subtest= inside_subtest=
test "$#" = 3 && { prereq=$1; shift; } || prereq= test "$#" = 3 && { prereq=$1; shift; } || prereq=
test "$#" = 2 || test "$#" = 2 ||
@ -630,6 +636,9 @@ test_emacs_expect_t () {
test "$#" = 2 && { prereq=$1; shift; } || prereq= 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 or 2 parameters to test_emacs_expect_t"
if [ -z "$inside_subtest" ]; then
error "bug in the test script: test_emacs_expect_t without test_begin_subtest"
fi
# Run the test. # Run the test.
if ! test_skip "$test_subtest_name" if ! test_skip "$test_subtest_name"