development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

t6030: use modern test_* helpers

Browse source 
We can get rid of a lot of hand-rolled error messages by
using test_must_fail and test_expect_code. The existing code
was careful to use "|| return 1" when breaking the
&&-chain, but it did fool --chain-lint; the new code is more
idiomatic.

We also add some uses of test_when_finished, which is less
cryptic and more robust than putting code at the end of a
test. In two cases we run "git bisect reset" from a
subshell, which is a problem for test_when_finished (it
would not run). However, in both of these cases, we are
performing the tests in one-off sub-repos, so we do not need
to clean up at all (and in fact it is nicer not to if the
user wants to inspect the trash directory after a failure).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-03-20 06:13:05 -04:00 committed by Junio C Hamano
parent d8cd32792a
commit e4e6e8b4e3
1 changed files with 31 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
t/t6030-bisect-porcelain.sh
View file

@ -52,15 +52,8 @@ test_expect_success 'bisect starts with only one bad' '
test_expect_success 'bisect does not start with only one good' ' test_expect_success 'bisect does not start with only one good' '
git bisect reset && git bisect reset &&
git bisect start && git bisect start &&
git bisect good $HASH1 || return 1 git bisect good $HASH1 &&
test_must_fail git bisect next
if git bisect next
then
echo Oops, should have failed.
false
else
:
fi
' '
test_expect_success 'bisect start with one bad and good' ' test_expect_success 'bisect start with one bad and good' '
@ -191,34 +184,27 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' '
# but $HASH2 is bad, # but $HASH2 is bad,
# so we should find $HASH2 as the first bad commit # so we should find $HASH2 as the first bad commit
test_expect_success 'bisect skip: successful result' ' test_expect_success 'bisect skip: successful result' '
test_when_finished git bisect reset &&
git bisect reset && git bisect reset &&
git bisect start $HASH4 $HASH1 && git bisect start $HASH4 $HASH1 &&
git bisect skip && git bisect skip &&
git bisect bad > my_bisect_log.txt && git bisect bad > my_bisect_log.txt &&
grep "$HASH2 is the first bad commit" my_bisect_log.txt && grep "$HASH2 is the first bad commit" my_bisect_log.txt
git bisect reset
' '
# $HASH1 is good, $HASH4 is bad, we skip $HASH3 and $HASH2 # $HASH1 is good, $HASH4 is bad, we skip $HASH3 and $HASH2
# so we should not be able to tell the first bad commit # so we should not be able to tell the first bad commit
# among $HASH2, $HASH3 and $HASH4 # among $HASH2, $HASH3 and $HASH4
test_expect_success 'bisect skip: cannot tell between 3 commits' ' test_expect_success 'bisect skip: cannot tell between 3 commits' '
test_when_finished git bisect reset &&
git bisect start $HASH4 $HASH1 && git bisect start $HASH4 $HASH1 &&
git bisect skip || return 1 git bisect skip &&
test_expect_code 2 git bisect skip >my_bisect_log.txt &&
if git bisect skip > my_bisect_log.txt grep "first bad commit could be any of" my_bisect_log.txt &&
then ! grep $HASH1 my_bisect_log.txt &&
echo Oops, should have failed. grep $HASH2 my_bisect_log.txt &&
false grep $HASH3 my_bisect_log.txt &&
else grep $HASH4 my_bisect_log.txt
test $? -eq 2 &&
grep "first bad commit could be any of" my_bisect_log.txt &&
! grep $HASH1 my_bisect_log.txt &&
grep $HASH2 my_bisect_log.txt &&
grep $HASH3 my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
git bisect reset
fi
' '
# $HASH1 is good, $HASH4 is bad, we skip $HASH3 # $HASH1 is good, $HASH4 is bad, we skip $HASH3
@ -226,22 +212,15 @@ test_expect_success 'bisect skip: cannot tell between 3 commits' '
# so we should not be able to tell the first bad commit # so we should not be able to tell the first bad commit
# among $HASH3 and $HASH4 # among $HASH3 and $HASH4
test_expect_success 'bisect skip: cannot tell between 2 commits' ' test_expect_success 'bisect skip: cannot tell between 2 commits' '
test_when_finished git bisect reset &&
git bisect start $HASH4 $HASH1 && git bisect start $HASH4 $HASH1 &&
git bisect skip || return 1 git bisect skip &&
test_expect_code 2 git bisect good >my_bisect_log.txt &&
if git bisect good > my_bisect_log.txt grep "first bad commit could be any of" my_bisect_log.txt &&
then ! grep $HASH1 my_bisect_log.txt &&
echo Oops, should have failed. ! grep $HASH2 my_bisect_log.txt &&
false grep $HASH3 my_bisect_log.txt &&
else grep $HASH4 my_bisect_log.txt
test $? -eq 2 &&
grep "first bad commit could be any of" my_bisect_log.txt &&
! grep $HASH1 my_bisect_log.txt &&
! grep $HASH2 my_bisect_log.txt &&
grep $HASH3 my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
git bisect reset
fi
' '
# $HASH1 is good, $HASH4 is both skipped and bad, we skip $HASH3 # $HASH1 is good, $HASH4 is both skipped and bad, we skip $HASH3
@ -249,24 +228,18 @@ test_expect_success 'bisect skip: cannot tell between 2 commits' '
# so we should not be able to tell the first bad commit # so we should not be able to tell the first bad commit
# among $HASH3 and $HASH4 # among $HASH3 and $HASH4
test_expect_success 'bisect skip: with commit both bad and skipped' ' test_expect_success 'bisect skip: with commit both bad and skipped' '
test_when_finished git bisect reset &&
git bisect start && git bisect start &&
git bisect skip && git bisect skip &&
git bisect bad && git bisect bad &&
git bisect good $HASH1 && git bisect good $HASH1 &&
git bisect skip && git bisect skip &&
if git bisect good > my_bisect_log.txt test_expect_code 2 git bisect good >my_bisect_log.txt &&
then grep "first bad commit could be any of" my_bisect_log.txt &&
echo Oops, should have failed. ! grep $HASH1 my_bisect_log.txt &&
false ! grep $HASH2 my_bisect_log.txt &&
else grep $HASH3 my_bisect_log.txt &&
test $? -eq 2 && grep $HASH4 my_bisect_log.txt
grep "first bad commit could be any of" my_bisect_log.txt &&
! grep $HASH1 my_bisect_log.txt &&
! grep $HASH2 my_bisect_log.txt &&
grep $HASH3 my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
git bisect reset
fi
' '
# We want to automatically find the commit that # We want to automatically find the commit that
@ -601,8 +574,7 @@ test_expect_success 'test bisection on bare repo - --no-checkout specified' '
git bisect bad $HASH4 && git bisect bad $HASH4 &&
git bisect run eval \ git bisect run eval \
"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \ "test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
>../nocheckout.log && >../nocheckout.log
git bisect reset
) && ) &&
grep "$HASH3 is the first bad commit" nocheckout.log grep "$HASH3 is the first bad commit" nocheckout.log
' '
@ -617,8 +589,7 @@ test_expect_success 'test bisection on bare repo - --no-checkout defaulted' '
git bisect bad $HASH4 && git bisect bad $HASH4 &&
git bisect run eval \ git bisect run eval \
"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \ "test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
>../defaulted.log && >../defaulted.log
git bisect reset
) && ) &&
grep "$HASH3 is the first bad commit" defaulted.log grep "$HASH3 is the first bad commit" defaulted.log
' '
@ -642,14 +613,14 @@ test_expect_success 'broken branch creation' '
mkdir missing && mkdir missing &&
:> missing/MISSING && :> missing/MISSING &&
git add missing/MISSING && git add missing/MISSING &&
git commit -m "6(broken): Added file that will be deleted" git commit -m "6(broken): Added file that will be deleted" &&
git tag BROKEN_HASH6 && git tag BROKEN_HASH6 &&
add_line_into_file "7(broken): second line on a broken branch" hello2 && add_line_into_file "7(broken): second line on a broken branch" hello2 &&
git tag BROKEN_HASH7 && git tag BROKEN_HASH7 &&
add_line_into_file "8(broken): third line on a broken branch" hello2 && add_line_into_file "8(broken): third line on a broken branch" hello2 &&
git tag BROKEN_HASH8 && git tag BROKEN_HASH8 &&
git rm missing/MISSING && git rm missing/MISSING &&
git commit -m "9(broken): Remove missing file" git commit -m "9(broken): Remove missing file" &&
git tag BROKEN_HASH9 && git tag BROKEN_HASH9 &&
rm .git/objects/39/f7e61a724187ab767d2e08442d9b6b9dab587d rm .git/objects/39/f7e61a724187ab767d2e08442d9b6b9dab587d
' '