development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

merge tests: use "test_must_fail" instead of ad-hoc pattern

Browse source 
As in the preceding commit change a similar fragile test pattern
introduced in b798671fa9 (merge-recursive: do not rudely die on
binary merge, 2007-08-14) to use a "test_must_fail" instead.

Before this we wouldn't distinguish normal "git merge" failures from
segfaults or abort(). Unlike the preceding commit we didn't end up
hiding any SANITIZE=leak failures in this case, but let's
correspondingly change these anyway.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-03-07 13:48:58 +01:00 committed by Junio C Hamano
parent 1ff543acd0
commit 8127a2b1f5
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
t/t6407-merge-binary.sh
View file

@ -43,14 +43,9 @@ test_expect_success resolve '
rm -f a* m* &&
git reset --hard anchor &&
if git merge -s resolve main
then
echo Oops, should not have succeeded
false
else
git ls-files -s >current &&
test_cmp expect current
fi
test_must_fail git merge -s resolve main &&
git ls-files -s >current &&
test_cmp expect current
'
test_expect_success recursive '
@ -58,14 +53,9 @@ test_expect_success recursive '
rm -f a* m* &&
git reset --hard anchor &&
if git merge -s recursive main
then
echo Oops, should not have succeeded
false
else
git ls-files -s >current &&
test_cmp expect current
fi
test_must_fail git merge -s recursive main &&
git ls-files -s >current &&
test_cmp expect current
'
test_done