t: use test_must_fail instead of hand-rolled blocks
These test scripts likely predate test_must_fail, and can be made simpler by using it (in addition to making them pass --chain-lint). The case in t6036 loses some verbosity in the failure case, but it is so tied to a specific failure mode that it is not worth keeping around (and the outcome of the test is not affected at all). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 20, 2015 at 06:09 UTC
0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8
3 files changed
+5
-14
t/t4124-apply-ws-rule.sh
+2
-3
@@ -99,9 +99,8 @@ test_expect_success 'whitespace=warn, default rule' '
99
100
test_expect_success 'whitespace=error-all, default rule' '
101
102
- apply_patch --whitespace=error-all && return 1
103
- test -s target && return 1
104
- : happy
102
+ test_must_fail apply_patch --whitespace=error-all &&
103
+ ! test -s target
104
105
'
106
t/t6036-recursive-corner-cases.sh
+1
-6
@@ -195,12 +195,7 @@ test_expect_success 'git detects differently handled merges conflict' '
195
git reset --hard &&
196
git checkout D^0 &&
197
198
- git merge -s recursive E^0 && {
199
- echo "BAD: should have conflicted"
200
- test "Incorrectly merged content" = "$(cat new_a)" &&
201
- echo "BAD: Silently accepted wrong content"
202
- return 1
203
- }
198
+ test_must_fail git merge -s recursive E^0 &&
199
200
test 3 = $(git ls-files -s | wc -l) &&
201
test 3 = $(git ls-files -u | wc -l) &&
t/t9300-fast-import.sh
+2
-5
@@ -2853,8 +2853,8 @@ test_expect_success 'S: notemodify with garbage after mark commit-ish must fail'
2853
# from
2854
#
2855
test_expect_success 'S: from with garbage after mark must fail' '
2856
- # no &&
2857
- git fast-import --import-marks=marks --export-marks=marks <<-EOF 2>err
2856
+ test_must_fail \
2857
+ git fast-import --import-marks=marks --export-marks=marks <<-EOF 2>err &&
2858
commit refs/heads/S2
2859
mark :303
2860
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
@@ -2865,9 +2865,6 @@ test_expect_success 'S: from with garbage after mark must fail' '
2865
M 100644 :403 hello.c
2866
EOF
2867
2868
- ret=$? &&
2869
- echo returned $ret &&
2870
- test $ret -ne 0 && # failed, but it created the commit
2868
2869
# go create the commit, need it for merge test
2870
git fast-import --import-marks=marks --export-marks=marks <<-EOF &&