Re: [PATCH 3/3] t5541: test more combinations of --progress
- From
Clemens Buchacher <drizzd@aon.at>
- Date
- May 1, 2012, 09:35 UTC
- Message-ID
- <20120501093501.GB22633@ecki.lan>
- In-Reply-To
- <20120501084307.GC4998@sigill.intra.peff.net>
Can we add this on top or squashed in? I regret using tee when I originally wrote the test.
--8<-- Subject: [PATCH] t5541: check return codes
By piping output to tee, the return code of the command is hidden. Instead, redirect output to a file directly.
Signed-off-by: Clemens Buchacher <drizzd@aon.at> --- t/t5541-http-push.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 986210a..c07973e 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -218,21 +218,21 @@ test_expect_success 'push --mirror to repo with alternates' ' test_expect_success TTY 'push shows progress when stderr is a tty' ' cd "$ROOT_PATH"/test_repo_clone && test_commit noisy && - test_terminal git push 2>&1 | tee output && + test_terminal git push >output 2>&1 && grep "^Writing objects" output ' test_expect_success TTY 'push --quiet silences status and progress' ' cd "$ROOT_PATH"/test_repo_clone && test_commit quiet && - test_terminal git push --quiet 2>&1 | tee output && + test_terminal git push --quiet >output 2>&1 && test_cmp /dev/null output ' test_expect_success TTY 'push --no-progress silences progress but not status' ' cd "$ROOT_PATH"/test_repo_clone && test_commit no-progress && - test_terminal git push --no-progress 2>&1 | tee output && + test_terminal git push --no-progress >output 2>&1 && grep "^To http" output && ! grep "^Writing objects" ' @@ -240,7 +240,7 @@ test_expect_success TTY 'push --no-progress silences progress but not status' ' test_expect_success 'push --progress shows progress to non-tty' ' cd "$ROOT_PATH"/test_repo_clone && test_commit progress && - git push --progress 2>&1 | tee output && + git push --progress >output 2>&1 && grep "^To http" output && grep "^Writing objects" output '
-- 1.7.10