development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

describe tests: fix nested "test_expect_success" call

Browse source 
Fix a nested invocation of "test_expect_success", the
"check_describe()" function is a wrapper for calling
test_expect_success, and therefore needs to be called outside the body
of another "test_expect_success".

The two tests added in 30b1c7ad9d (describe: don't abort too early
when searching tags, 2020-02-26) were not testing for anything due to
this logic error. Without this fix reverting the C code changes in
that commit still has all tests passing, with this fix we're actually
testing the "describe" output. This is because "test_expect_success"
calls "test_finish_", whose last statement happens to be true.

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 2021-04-12 13:21:46 +02:00 committed by Junio C Hamano
parent 7f07c1cdb7
commit 33b4ae1114
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
t/t6120-describe.sh
View file

@ -469,7 +469,7 @@ test_expect_success 'name-rev covers all conditions while looking at parents' '
# o-----o---o----x
# A
#
test_expect_success 'describe commits with disjoint bases' '
test_expect_success 'setup: describe commits with disjoint bases' '
git init disjoint1 &&
(
cd disjoint1 &&
@ -482,19 +482,22 @@ test_expect_success 'describe commits with disjoint bases' '
git checkout --orphan branch && rm file &&
echo B > file2 && git add file2 && git commit -m B &&
git tag B -a -m B &&
git merge --no-ff --allow-unrelated-histories main -m x &&
check_describe "A-3-gHASH" HEAD
git merge --no-ff --allow-unrelated-histories main -m x
)
'
(
cd disjoint1 &&
check_describe "A-3-gHASH" HEAD
)
# B
# o---o---o------------.
# \
# o---o---x
# A
#
test_expect_success 'describe commits with disjoint bases 2' '
test_expect_success 'setup: describe commits with disjoint bases 2' '
git init disjoint2 &&
(
cd disjoint2 &&
@ -508,10 +511,13 @@ test_expect_success 'describe commits with disjoint bases 2' '
echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
git tag B -a -m B &&
git merge --no-ff --allow-unrelated-histories main -m x &&
check_describe "B-3-gHASH" HEAD
git merge --no-ff --allow-unrelated-histories main -m x
)
'
(
cd disjoint2 &&
check_describe "B-3-gHASH" HEAD
)
test_done