Skip to content

Commit

Permalink
t0000: replace test_must_fail with run_sub_test_lib_test_err()
Browse files Browse the repository at this point in the history
The test_must_fail function should only be used for git commands since
we should assume that external commands work sanely. We use
test_must_fail to test run_sub_test_lib_test() but that function does
not invoke any git commands internally. Even better, we have a function
that's exactly meant to be used when we expect to have a failing test
suite: run_sub_test_lib_test_err()!

Replace `test_must_fail run_sub_test_lib_test` with
`run_sub_test_lib_test_err`.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Denton-L authored and gitster committed Dec 20, 2019
1 parent b8afb90 commit 7717242
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions t/t0000-basic.sh
Expand Up @@ -154,7 +154,7 @@ test_expect_success 'pretend we have a fully passing test suite' "
"

test_expect_success 'pretend we have a partially passing test suite' "
test_must_fail run_sub_test_lib_test \
run_sub_test_lib_test_err \
partial-pass '2/3 tests passing' <<-\\EOF &&
test_expect_success 'passing test #1' 'true'
test_expect_success 'failing test #2' 'false'
Expand Down Expand Up @@ -218,7 +218,7 @@ test_expect_success 'pretend we have fixed one of two known breakages (run in su
"

test_expect_success 'pretend we have a pass, fail, and known breakage' "
test_must_fail run_sub_test_lib_test \
run_sub_test_lib_test_err \
mixed-results1 'mixed results #1' <<-\\EOF &&
test_expect_success 'passing test' 'true'
test_expect_success 'failing test' 'false'
Expand All @@ -237,7 +237,7 @@ test_expect_success 'pretend we have a pass, fail, and known breakage' "
"

test_expect_success 'pretend we have a mix of all possible results' "
test_must_fail run_sub_test_lib_test \
run_sub_test_lib_test_err \
mixed-results2 'mixed results #2' <<-\\EOF &&
test_expect_success 'passing test' 'true'
test_expect_success 'passing test' 'true'
Expand Down Expand Up @@ -273,7 +273,7 @@ test_expect_success 'pretend we have a mix of all possible results' "
"

test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
test_must_fail run_sub_test_lib_test \
run_sub_test_lib_test_err \
t1234-verbose "test verbose" --verbose <<-\EOF &&
test_expect_success "passing test" true
test_expect_success "test with output" "echo foo"
Expand All @@ -300,7 +300,7 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
'

test_expect_success 'test --verbose-only' '
test_must_fail run_sub_test_lib_test \
run_sub_test_lib_test_err \
t2345-verbose-only-2 "test verbose-only=2" \
--verbose-only=2 <<-\EOF &&
test_expect_success "passing test" true
Expand Down Expand Up @@ -833,7 +833,7 @@ then
fi

test_expect_success 'tests clean up even on failures' "
test_must_fail run_sub_test_lib_test \
run_sub_test_lib_test_err \
failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
test_expect_success 'tests clean up even after a failure' '
touch clean-after-failure &&
Expand Down Expand Up @@ -862,7 +862,7 @@ test_expect_success 'tests clean up even on failures' "
"

test_expect_success 'test_atexit is run' "
test_must_fail run_sub_test_lib_test \
run_sub_test_lib_test_err \
atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
test_expect_success 'tests clean up even after a failure' '
> ../../clean-atexit &&
Expand Down

0 comments on commit 7717242

Please sign in to comment.