From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 17/25] t0020: use modern test_* helpers
Date: Wed, 25 Mar 2015 01:23:23 +0100 [thread overview]
Message-ID: <20150325012323.Horde.zCWvV1mF8OBE1PxYPuuEFg8@webmail.informatik.kit.edu> (raw)
In-Reply-To: <20150320101308.GQ12543@peff.net>
Quoting Jeff King <peff@peff.net>:
> This test contains a lot of hand-rolled messages to show
> when the test fails. We can omit most of these by using
> "verbose" and "test_must_fail". A few of them are for
> update-index, but we can assume it produces reasonable error
> messages when it fails.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> t/t0020-crlf.sh | 144
> +++++++++++---------------------------------------------
> 1 file changed, 28 insertions(+), 116 deletions(-)
>
> diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
> index d2e51a8..9fa26df 100755
> --- a/t/t0020-crlf.sh
> +++ b/t/t0020-crlf.sh
> @@ -104,18 +104,12 @@ test_expect_success 'update with autocrlf=input' '
> for f in one dir/two
> do
> append_cr <$f >tmp && mv -f tmp $f &&
> - git update-index -- $f || {
> - echo Oops
> - false
> - break
> - }
> + git update-index -- $f ||
> + break
> done &&
Ah, these tests are evil, I remember them from the time when I was
fiddling with Jonathan's patch. They can fail silently without
testing what they were supposed to test.
If something in the loop fails, the break will leave the loop but it
will do so with zero return value and, consequently, the test will
continue as if everything were OK.
And unless it was 'git update-index' that failed in a way that left a
borked index behind, the 'git diff-index --cached' below will not
error out or produce some output that would cause the test to fail.
i.e. I tried e.g.
append_cr <$f >tmp && mv -f tmp $f && false &&
in the loop and the test succeeded.
I think the best fix would be to unroll the loop: after this patch the
loop body consists of only two significant lines and we iterate
through the loop only twice, so the test would be even shorter.
> differs=$(git diff-index --cached HEAD) &&
> - test -z "$differs" || {
> - echo Oops "$differs"
> - false
> - }
> + verbose test -z "$differs"
>
> '
>
> @@ -128,18 +122,12 @@ test_expect_success 'update with autocrlf=true' '
> for f in one dir/two
> do
> append_cr <$f >tmp && mv -f tmp $f &&
> - git update-index -- $f || {
> - echo "Oops $f"
> - false
> - break
> - }
> + git update-index -- $f ||
> + break
> done &&
>
> differs=$(git diff-index --cached HEAD) &&
> - test -z "$differs" || {
> - echo Oops "$differs"
> - false
> - }
> + verbose test -z "$differs"
>
> '
>
> @@ -152,19 +140,13 @@ test_expect_success 'checkout with autocrlf=true' '
> for f in one dir/two
> do
> remove_cr <"$f" >tmp && mv -f tmp $f &&
> - git update-index -- $f || {
> - echo "Eh? $f"
> - false
> - break
> - }
> + verbose git update-index -- $f ||
> + break
> done &&
> test "$one" = $(git hash-object --stdin <one) &&
> test "$two" = $(git hash-object --stdin <dir/two) &&
> differs=$(git diff-index --cached HEAD) &&
> - test -z "$differs" || {
> - echo Oops "$differs"
> - false
> - }
> + verbose test -z "$differs"
> '
>
> test_expect_success 'checkout with autocrlf=input' '
> @@ -187,10 +169,7 @@ test_expect_success 'checkout with autocrlf=input' '
> test "$one" = $(git hash-object --stdin <one) &&
> test "$two" = $(git hash-object --stdin <dir/two) &&
> differs=$(git diff-index --cached HEAD) &&
> - test -z "$differs" || {
> - echo Oops "$differs"
> - false
> - }
> + verbose test -z "$differs"
> '
>
> test_expect_success 'apply patch (autocrlf=input)' '
> @@ -200,10 +179,7 @@ test_expect_success 'apply patch (autocrlf=input)' '
> git read-tree --reset -u HEAD &&
>
> git apply patch.file &&
> - test "$patched" = "$(git hash-object --stdin <one)" || {
> - echo "Eh? apply without index"
> - false
> - }
> + verbose test "$patched" = "$(git hash-object --stdin <one)"
> '
>
> test_expect_success 'apply patch --cached (autocrlf=input)' '
> @@ -213,10 +189,7 @@ test_expect_success 'apply patch --cached
> (autocrlf=input)' '
> git read-tree --reset -u HEAD &&
>
> git apply --cached patch.file &&
> - test "$patched" = $(git rev-parse :one) || {
> - echo "Eh? apply with --cached"
> - false
> - }
> + verbose test "$patched" = $(git rev-parse :one)
> '
>
> test_expect_success 'apply patch --index (autocrlf=input)' '
> @@ -226,11 +199,8 @@ test_expect_success 'apply patch --index
> (autocrlf=input)' '
> git read-tree --reset -u HEAD &&
>
> git apply --index patch.file &&
> - test "$patched" = $(git rev-parse :one) &&
> - test "$patched" = $(git hash-object --stdin <one) || {
> - echo "Eh? apply with --index"
> - false
> - }
> + verbose test "$patched" = $(git rev-parse :one) &&
> + verbose test "$patched" = $(git hash-object --stdin <one)
> '
>
> test_expect_success 'apply patch (autocrlf=true)' '
> @@ -240,10 +210,7 @@ test_expect_success 'apply patch (autocrlf=true)' '
> git read-tree --reset -u HEAD &&
>
> git apply patch.file &&
> - test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || {
> - echo "Eh? apply without index"
> - false
> - }
> + verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
> '
>
> test_expect_success 'apply patch --cached (autocrlf=true)' '
> @@ -253,10 +220,7 @@ test_expect_success 'apply patch --cached
> (autocrlf=true)' '
> git read-tree --reset -u HEAD &&
>
> git apply --cached patch.file &&
> - test "$patched" = $(git rev-parse :one) || {
> - echo "Eh? apply without index"
> - false
> - }
> + verbose test "$patched" = $(git rev-parse :one)
> '
>
> test_expect_success 'apply patch --index (autocrlf=true)' '
> @@ -266,11 +230,8 @@ test_expect_success 'apply patch --index
> (autocrlf=true)' '
> git read-tree --reset -u HEAD &&
>
> git apply --index patch.file &&
> - test "$patched" = $(git rev-parse :one) &&
> - test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || {
> - echo "Eh? apply with --index"
> - false
> - }
> + verbose test "$patched" = $(git rev-parse :one) &&
> + verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
> '
>
> test_expect_success '.gitattributes says two is binary' '
> @@ -326,21 +287,8 @@ test_expect_success '.gitattributes says two and
> three are text' '
> echo "t* crlf" >.gitattributes &&
> git read-tree --reset -u HEAD &&
>
> - if has_cr dir/two
> - then
> - : happy
> - else
> - echo "Huh?"
> - false
> - fi &&
> -
> - if has_cr three
> - then
> - : happy
> - else
> - echo "Huh?"
> - false
> - fi
> + verbose has_cr dir/two &&
> + verbose has_cr three
> '
>
> test_expect_success 'in-tree .gitattributes (1)' '
> @@ -352,17 +300,8 @@ test_expect_success 'in-tree .gitattributes (1)' '
> rm -rf tmp one dir .gitattributes patch.file three &&
> git read-tree --reset -u HEAD &&
>
> - if has_cr one
> - then
> - echo "Eh? one should not have CRLF"
> - false
> - else
> - : happy
> - fi &&
> - has_cr three || {
> - echo "Eh? three should still have CRLF"
> - false
> - }
> + test_must_fail has_cr one &&
> + verbose has_cr three
> '
>
> test_expect_success 'in-tree .gitattributes (2)' '
> @@ -371,17 +310,8 @@ test_expect_success 'in-tree .gitattributes (2)' '
> git read-tree --reset HEAD &&
> git checkout-index -f -q -u -a &&
>
> - if has_cr one
> - then
> - echo "Eh? one should not have CRLF"
> - false
> - else
> - : happy
> - fi &&
> - has_cr three || {
> - echo "Eh? three should still have CRLF"
> - false
> - }
> + test_must_fail has_cr one &&
> + verbose has_cr three
> '
>
> test_expect_success 'in-tree .gitattributes (3)' '
> @@ -391,17 +321,8 @@ test_expect_success 'in-tree .gitattributes (3)' '
> git checkout-index -u .gitattributes &&
> git checkout-index -u one dir/two three &&
>
> - if has_cr one
> - then
> - echo "Eh? one should not have CRLF"
> - false
> - else
> - : happy
> - fi &&
> - has_cr three || {
> - echo "Eh? three should still have CRLF"
> - false
> - }
> + test_must_fail has_cr one &&
> + verbose has_cr three
> '
>
> test_expect_success 'in-tree .gitattributes (4)' '
> @@ -411,17 +332,8 @@ test_expect_success 'in-tree .gitattributes (4)' '
> git checkout-index -u one dir/two three &&
> git checkout-index -u .gitattributes &&
>
> - if has_cr one
> - then
> - echo "Eh? one should not have CRLF"
> - false
> - else
> - : happy
> - fi &&
> - has_cr three || {
> - echo "Eh? three should still have CRLF"
> - false
> - }
> + test_must_fail has_cr one &&
> + verbose has_cr three
> '
>
> test_expect_success 'checkout with existing .gitattributes' '
> --
> 2.3.3.520.g3cfbb5d
next prev parent reply other threads:[~2015-03-25 0:23 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 10:04 [PATCH 0/25] detecting &&-chain breakage Jeff King
2015-03-20 10:05 ` [PATCH 01/25] t/test-lib: introduce --chain-lint option Jeff King
2015-03-25 2:53 ` SZEDER Gábor
2015-03-25 3:05 ` Jeff King
2015-03-20 10:06 ` [PATCH 02/25] t: fix severe &&-chain breakage Jeff King
2015-03-20 10:06 ` [PATCH 03/25] t: fix moderate " Jeff King
2015-03-20 10:07 ` [PATCH 04/25] t: fix trivial " Jeff King
2015-03-20 10:07 ` [PATCH 05/25] t: assume test_cmp produces verbose output Jeff King
2015-03-20 10:09 ` [PATCH 06/25] t: use verbose instead of hand-rolled errors Jeff King
2015-03-20 10:09 ` [PATCH 07/25] t: use test_must_fail instead of hand-rolled blocks Jeff King
2015-03-20 10:10 ` [PATCH 08/25] t: fix &&-chaining issues around setup which might fail Jeff King
2015-03-20 10:11 ` [PATCH 09/25] t: use test_might_fail for diff and grep Jeff King
2015-03-20 10:11 ` [PATCH 10/25] t: use test_expect_code instead of hand-rolled comparison Jeff King
2015-03-20 10:12 ` [PATCH 11/25] t: wrap complicated expect_code users in a block Jeff King
2015-03-20 10:12 ` [PATCH 12/25] t: avoid using ":" for comments Jeff King
2015-03-20 10:12 ` [PATCH 13/25] t3600: fix &&-chain breakage for setup commands Jeff King
2015-03-20 10:12 ` [PATCH 14/25] t7201: fix &&-chain breakage Jeff King
2015-03-20 10:13 ` [PATCH 15/25] t9502: " Jeff King
2015-03-20 17:48 ` Johannes Sixt
2015-03-20 18:03 ` Jeff King
2015-03-20 10:13 ` [PATCH 16/25] t6030: use modern test_* helpers Jeff King
2015-03-20 10:13 ` [PATCH 17/25] t0020: " Jeff King
2015-03-25 0:23 ` SZEDER Gábor [this message]
2015-03-25 2:56 ` Jeff King
2015-03-25 5:24 ` [PATCH 0/8] more &&-chaining test fixups Jeff King
2015-03-25 5:25 ` [PATCH 1/8] perf-lib: fix ignored exit code inside loop Jeff King
2015-03-25 5:28 ` [PATCH 2/8] t0020: fix ignored exit code inside loops Jeff King
2015-03-25 5:28 ` [PATCH 3/8] t3305: fix ignored exit code inside loop Jeff King
2015-03-25 8:40 ` Johan Herland
2015-03-25 5:29 ` [PATCH 4/8] t7701: " Jeff King
2015-03-25 5:29 ` [PATCH 5/8] t: fix some trivial cases of ignored exit codes in loops Jeff King
2015-03-25 5:30 ` [PATCH 6/8] t: simplify loop exit-code status variables Jeff King
2015-03-25 17:27 ` Junio C Hamano
2015-03-25 17:43 ` Jeff King
2015-03-25 5:31 ` [PATCH 7/8] t0020: use test_* helpers instead of hand-rolled messages Jeff King
2015-03-25 5:32 ` [PATCH 8/8] t9001: drop save_confirm helper Jeff King
2015-03-25 17:29 ` [PATCH 0/8] more &&-chaining test fixups Junio C Hamano
2015-03-20 10:13 ` [PATCH 18/25] t1301: use modern test_* helpers Jeff King
2015-03-24 23:51 ` SZEDER Gábor
2015-03-25 2:45 ` Jeff King
2015-03-20 10:13 ` [PATCH 19/25] t6034: " Jeff King
2015-03-24 23:43 ` SZEDER Gábor
2015-03-20 10:13 ` [PATCH 20/25] t4117: " Jeff King
2015-03-20 10:13 ` [PATCH 21/25] t9001: use test_when_finished Jeff King
2015-03-25 2:00 ` SZEDER Gábor
2015-03-25 2:47 ` Jeff King
2015-03-20 10:13 ` [PATCH 22/25] t0050: appease --chain-lint Jeff King
2015-03-20 10:13 ` [PATCH 23/25] t7004: fix embedded single-quotes Jeff King
2015-03-20 10:13 ` [PATCH 24/25] t0005: fix broken &&-chains Jeff King
2015-03-20 10:13 ` [PATCH 25/25] t4104: drop hand-rolled error reporting Jeff King
2015-03-20 10:23 ` [PATCH 0/25] detecting &&-chain breakage Jeff King
2015-03-20 14:28 ` Michael J Gruber
2015-03-20 14:32 ` [PATCH 26/27] t/*svn*: fix moderate " Michael J Gruber
2015-03-20 14:32 ` [PATCH 27/27] t9104: fix test for following larger parents Michael J Gruber
2015-03-20 18:04 ` [PATCH 26/27] t/*svn*: fix moderate &&-chain breakage Junio C Hamano
2015-03-20 19:35 ` Junio C Hamano
2015-03-20 20:02 ` Jeff King
2015-03-20 20:13 ` Jeff King
2015-03-23 9:36 ` Michael J Gruber
2015-03-20 17:57 ` [PATCH 0/25] detecting " Jeff King
2015-03-20 17:44 ` Junio C Hamano
2015-03-20 18:00 ` Junio C Hamano
2015-03-20 18:04 ` Jeff King
2015-03-20 18:33 ` Junio C Hamano
2015-03-20 23:18 ` Eric Sunshine
2015-03-21 8:19 ` Jeff King
2015-03-21 18:01 ` Junio C Hamano
2015-03-21 22:23 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150325012323.Horde.zCWvV1mF8OBE1PxYPuuEFg8@webmail.informatik.kit.edu \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).