describe tests: fix nested "test_expect_success" call
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 30b1c7ad9d6 (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>
Ævar Arnfjörð Bjarmason committed
Apr 12, 2021 at 13:21 UTC
33b4ae11146ba0c468176d238d231e1101ba19cd
1 file changed
+14
-8
t/t6120-describe.sh
+14
-8
@@ -469,7 +469,7 @@ test_expect_success 'name-rev covers all conditions while looking at parents' '
469
# o-----o---o----x
470
# A
471
#
472
-test_expect_success 'describe commits with disjoint bases' '
472
+test_expect_success 'setup: describe commits with disjoint bases' '
473
git init disjoint1 &&
474
(
475
cd disjoint1 &&
@@ -482,19 +482,22 @@ test_expect_success 'describe commits with disjoint bases' '
482
git checkout --orphan branch && rm file &&
483
echo B > file2 && git add file2 && git commit -m B &&
484
git tag B -a -m B &&
485
- git merge --no-ff --allow-unrelated-histories main -m x &&
486
-
487
- check_describe "A-3-gHASH" HEAD
485
+ git merge --no-ff --allow-unrelated-histories main -m x
486
)
487
'
488
489
+(
490
+ cd disjoint1 &&
491
+ check_describe "A-3-gHASH" HEAD
492
+)
493
+
494
# B
495
# o---o---o------------.
496
# \
497
# o---o---x
498
# A
499
#
497
-test_expect_success 'describe commits with disjoint bases 2' '
500
+test_expect_success 'setup: describe commits with disjoint bases 2' '
501
git init disjoint2 &&
502
(
503
cd disjoint2 &&
@@ -508,10 +511,13 @@ test_expect_success 'describe commits with disjoint bases 2' '
511
echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
512
echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
513
git tag B -a -m B &&
511
- git merge --no-ff --allow-unrelated-histories main -m x &&
512
-
513
- check_describe "B-3-gHASH" HEAD
514
+ git merge --no-ff --allow-unrelated-histories main -m x
515
)
516
'
517
518
+(
519
+ cd disjoint2 &&
520
+ check_describe "B-3-gHASH" HEAD
521
+)
522
+
523
test_done