[PATCH 1/2] t4205: drop top-level &&-chaining
- From
Jeff King <peff@peff.net>
- Date
- Jul 27, 2016, 18:55 UTC
- Message-ID
- <20160727185501.GA6626@sigill.intra.peff.net>
- In-Reply-To
- <20160727185256.GA11657@sigill.intra.peff.net>
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> --- t/t4205-log-pretty-formats.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index d9f6242..d6518fa 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 &&
-- 2.9.2.607.g98dce7b