On Thu, Nov 19, 2020 at 10:58:24AM -0500, Jeff King wrote: > > +if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" && test "$nestedworks" != yes > > +then > > + say 'bug in test framework: nested lazy prerequisites do not work' > > + exit 1 > > +fi > > I was surprised to see this bare exit, because I know we have some > functions (run_sub_test_*) to help with testing the framework itself. It > looks like the other prereq tests don't use it either, though. I wonder > if there is a technical reason, or if they were simply added at a > different time. (Either way, I am OK for your new test to match the > surrounding ones like you have here). I took a look at converting some of the existing tests. This seems to work. It's a bit longer to read, perhaps, but I kind of like that the expected outcome is all laid out. It also pollutes the test output less (e.g., if you wanted to count up skipped tests in the whole suite, you'd get a bunch of noise from t0000 for these uninteresting skips). Thoughts? I think this is something I'd do on top of your patch. diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index f4ba2e8c85..f369af76be 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -759,43 +759,50 @@ test_expect_success '--run invalid range end' " EOF_ERR " - -test_set_prereq HAVEIT -haveit=no -test_expect_success HAVEIT 'test runs if prerequisite is satisfied' ' - test_have_prereq HAVEIT && - haveit=yes -' -donthaveit=yes -test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' ' - donthaveit=no -' -if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit != yesyes -then - say "bug in test framework: prerequisite tags do not work reliably" - exit 1 -fi - -test_set_prereq HAVETHIS -haveit=no -test_expect_success HAVETHIS,HAVEIT 'test runs if prerequisites are satisfied' ' - test_have_prereq HAVEIT && - test_have_prereq HAVETHIS && - haveit=yes -' -donthaveit=yes -test_expect_success HAVEIT,DONTHAVEIT 'unmet prerequisites causes test to be skipped' ' - donthaveit=no -' -donthaveiteither=yes -test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' ' - donthaveiteither=no +test_expect_success 'tests respect prerequisites' ' + run_sub_test_lib_test prereqs "tests respect prereqs" <<-\EOF && + + test_set_prereq HAVEIT + haveit=no + test_expect_success HAVEIT "prereq is satisfied" " + test_have_prereq HAVEIT && + haveit=yes + " + + donthaveit=yes + test_expect_success DONTHAVEIT "prereq not satisfied" " + donthaveit=no + " + + test_set_prereq HAVETHIS + haveit=no + test_expect_success HAVETHIS,HAVEIT "multiple prereqs" " + test_have_prereq HAVEIT && + test_have_prereq HAVETHIS && + haveit=yes + " + + donthaveit=yes + test_expect_success HAVEIT,DONTHAVEIT "mixed prereqs (yes,no)" " + donthaveit=no + " + + donthaveiteither=yes + test_expect_success DONTHAVEIT,HAVEIT "mixed prereqs (no,yes)" " + donthaveiteither=no + " + test_done + EOF + check_sub_test_lib_test prereqs <<-\EOF + ok 1 - prereq is satisfied + ok 2 # skip prereq not satisfied (missing DONTHAVEIT) + ok 3 - multiple prereqs + ok 4 # skip mixed prereqs (yes,no) (missing DONTHAVEIT of HAVEIT,DONTHAVEIT) + ok 5 # skip mixed prereqs (no,yes) (missing DONTHAVEIT of DONTHAVEIT,HAVEIT) + # passed all 5 test(s) + 1..5 + EOF ' -if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit$donthaveiteither != yesyesyes -then - say "bug in test framework: multiple prerequisite tags do not work reliably" - exit 1 -fi test_lazy_prereq LAZY_TRUE true havetrue=no
