diff options
author | Jeff King <peff@peff.net> | 2016-07-27 14:55:02 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-27 12:27:37 -0700 |
commit | 1bd37509cac35877761a21c0654eba18fb5a73ad (patch) | |
tree | 787954e7f3ff2a8f72241974ced7068c8ddf63e1 /t/t4205-log-pretty-formats.sh | |
parent | e634160bf457f8b3a91125307681c9493f11afb2 (diff) | |
download | git-1bd37509cac35877761a21c0654eba18fb5a73ad.tar.gz git-1bd37509cac35877761a21c0654eba18fb5a73ad.tar.xz |
t4205: drop top-level &&-chaining
The test currently does something like:
do_one() &&
do_two() &&
test_expect_success ...
We generally avoid performing actions at the top-level of
the script (outside of a test_expect block) for two reasons:
1. The test harness is not checking and reporting if they
fail.
2. Their output is not handled correctly (not hidden by
default, nor shown with "-v").
Using &&-chains seems like it should help with (1), but it
doesn't. If either of the commands fails, we simply skip
running the follow-on test entirely, and the test harness
has no idea.
We can fix this by pushing that setup into its own block.
It _could_ go into the following test block, but since the
result in this case is used by multiple tests, it's more
clear to mark it explicitly as a distinct setup step.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4205-log-pretty-formats.sh')
-rwxr-xr-x | t/t4205-log-pretty-formats.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index d9f62425b..d6518fa66 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -504,8 +504,10 @@ test_expect_success 'ISO and ISO-strict date formats display the same values' ' ' # get new digests (with no abbreviations) -head1=$(git rev-parse --verify HEAD~0) && -head2=$(git rev-parse --verify HEAD~1) && +test_expect_success 'set up log decoration tests' ' + head1=$(git rev-parse --verify HEAD~0) && + head2=$(git rev-parse --verify HEAD~1) +' test_expect_success 'log decoration properly follows tag chain' ' git tag -a tag1 -m tag1 && |