t0000: replace test_must_fail with run_sub_test_lib_test_err()
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>
Denton Liu committed
Dec 20, 2019 at 10:15 UTC
7717242014dc59f58db7e56c2b8f9fc79e04fa0b
1 file changed
+7
-7
t/t0000-basic.sh
+7
-7
@@ -154,7 +154,7 @@ test_expect_success 'pretend we have a fully passing test suite' "
154
"
155
156
test_expect_success 'pretend we have a partially passing test suite' "
157
- test_must_fail run_sub_test_lib_test \
157
+ run_sub_test_lib_test_err \
158
partial-pass '2/3 tests passing' <<-\\EOF &&
159
test_expect_success 'passing test #1' 'true'
160
test_expect_success 'failing test #2' 'false'
@@ -218,7 +218,7 @@ test_expect_success 'pretend we have fixed one of two known breakages (run in su
218
"
219
220
test_expect_success 'pretend we have a pass, fail, and known breakage' "
221
- test_must_fail run_sub_test_lib_test \
221
+ run_sub_test_lib_test_err \
222
mixed-results1 'mixed results #1' <<-\\EOF &&
223
test_expect_success 'passing test' 'true'
224
test_expect_success 'failing test' 'false'
@@ -237,7 +237,7 @@ test_expect_success 'pretend we have a pass, fail, and known breakage' "
237
"
238
239
test_expect_success 'pretend we have a mix of all possible results' "
240
- test_must_fail run_sub_test_lib_test \
240
+ run_sub_test_lib_test_err \
241
mixed-results2 'mixed results #2' <<-\\EOF &&
242
test_expect_success 'passing test' 'true'
243
test_expect_success 'passing test' 'true'
@@ -273,7 +273,7 @@ test_expect_success 'pretend we have a mix of all possible results' "
273
"
274
275
test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
276
- test_must_fail run_sub_test_lib_test \
276
+ run_sub_test_lib_test_err \
277
t1234-verbose "test verbose" --verbose <<-\EOF &&
278
test_expect_success "passing test" true
279
test_expect_success "test with output" "echo foo"
@@ -300,7 +300,7 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
300
'
301
302
test_expect_success 'test --verbose-only' '
303
- test_must_fail run_sub_test_lib_test \
303
+ run_sub_test_lib_test_err \
304
t2345-verbose-only-2 "test verbose-only=2" \
305
--verbose-only=2 <<-\EOF &&
306
test_expect_success "passing test" true
@@ -833,7 +833,7 @@ then
833
fi
834
835
test_expect_success 'tests clean up even on failures' "
836
- test_must_fail run_sub_test_lib_test \
836
+ run_sub_test_lib_test_err \
837
failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
838
test_expect_success 'tests clean up even after a failure' '
839
touch clean-after-failure &&
@@ -862,7 +862,7 @@ test_expect_success 'tests clean up even on failures' "
862
"
863
864
test_expect_success 'test_atexit is run' "
865
- test_must_fail run_sub_test_lib_test \
865
+ run_sub_test_lib_test_err \
866
atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
867
test_expect_success 'tests clean up even after a failure' '
868
> ../../clean-atexit &&