[PATCH 04/16] t5312: drop "verbose" helper
- From
Jeff King <peff@peff.net>
- Date
- Sep 24, 2021, 18:35 UTC
- Message-ID
- <YU4acRiq8YrhEOYu@coredump.intra.peff.net>
- In-Reply-To
- <YU4ZOF9+ubmoItmK@coredump.intra.peff.net>
t5312 has several uses of the "verbose" helper, as described in 8ad1652418 (t5304: use helper to report failure of "test foo = bar", 2014-10-10). Back then the "-x" trace option for tests was new, and was not as pleasant to use (e.g., some tests failed under "-x", we did not support BASH_XTRACEFD, etc).
These days it is clear that "-x" is the preferred way to get extra output, and we don't need to mark up individual tests. Let's get rid of the uses of "verbose" here, as one step toward eradicating it totally.
Signed-off-by: Jeff King <peff@peff.net> --- I've been tempted to do this tree-wide for a while, and I don't mind doing that separately. But as I was touching these tests, it seemed like a good time to do it here.
t/t5312-prune-corruption.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh index 11423b3cb2..165cc80fa4 100755 --- a/t/t5312-prune-corruption.sh +++ b/t/t5312-prune-corruption.sh @@ -31,21 +31,21 @@ test_expect_success 'create history reachable only from a bogus-named ref' ' test_expect_success 'pruning does not drop bogus object' ' test_when_finished "git hash-object -w -t commit saved" && test_might_fail git prune --expire=now && - verbose git cat-file -e $bogus + git cat-file -e $bogus ' test_expect_success 'put bogus object into pack' ' git tag reachable $bogus && git repack -ad && git tag -d reachable && - verbose git cat-file -e $bogus + git cat-file -e $bogus ' test_expect_success 'destructive repack keeps packed object' ' test_might_fail git repack -Ad --unpack-unreachable=now && - verbose git cat-file -e $bogus && + git cat-file -e $bogus && test_might_fail git repack -ad && - verbose git cat-file -e $bogus + git cat-file -e $bogus ' # subsequent tests will have different corruptions @@ -78,7 +78,7 @@ test_expect_success 'create history with missing tip commit' ' test_expect_success 'pruning with a corrupted tip does not drop history' ' test_when_finished "git hash-object -w -t commit saved" && test_might_fail git prune --expire=now && - verbose git cat-file -e $recoverable + git cat-file -e $recoverable ' test_expect_success 'pack-refs does not silently delete broken loose ref' '
-- 2.33.0.1071.gb37e412355