From: "Rubén Justo" <rjusto@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] tests: drop use of 'tee' that hides exit status
Date: Fri, 9 Aug 2024 02:37:29 +0200 [thread overview]
Message-ID: <93e6fdd3-4a15-4cc5-929a-aa5e79f44e1c@gmail.com> (raw)
In-Reply-To: <xmqq4j7uhfvm.fsf@gitster.g>
On Thu, Aug 08, 2024 at 02:19:25PM -0700, Junio C Hamano wrote:
> A few tests have "| tee output" downstream of a git command, and
> then inspect the contents of the file. The net effect is that we
> use an extra process, and hide the exit status from the upstream git
> command.
>
> In none of these tests, I do not see a reason why we want to hide a
This double negative caught my attention. The message is
understandable; perhaps "In none of these tests I see ..." would have
been clearer.
> possible failure from these git commands. Replace the use of tee
> with a plain simple redirection.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> t/t1001-read-tree-m-2way.sh | 2 +-
> t/t5523-push-upstream.sh | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
A simple search only points to these two files:
$ git grep '\s*git.*|\s*tee' "t/t[0-9]*.sh"
t/t1001-read-tree-m-2way.sh:400: git ls-files --stage | tee >treeMcheck.out &&
t/t5523-push-upstream.sh:127: test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
t/t5523-push-upstream.sh:134: test_terminal git push --quiet -u --no-progress upstream main 2>&1 | tee output &&
And the following three changes are in line with the result:
>
> diff --git c/t/t1001-read-tree-m-2way.sh w/t/t1001-read-tree-m-2way.sh
> index 88c524f655..48a1550371 100755
> --- c/t/t1001-read-tree-m-2way.sh
> +++ w/t/t1001-read-tree-m-2way.sh
> @@ -397,7 +397,7 @@ test_expect_success 'a/b vs a, plus c/d case setup.' '
>
> test_expect_success 'a/b vs a, plus c/d case test.' '
> read_tree_u_must_succeed -u -m "$treeH" "$treeM" &&
> - git ls-files --stage | tee >treeMcheck.out &&
> + git ls-files --stage >treeMcheck.out &&
> test_cmp treeM.out treeMcheck.out
> '
>
> diff --git c/t/t5523-push-upstream.sh w/t/t5523-push-upstream.sh
> index 1f859ade16..4ad36a31e1 100755
> --- c/t/t5523-push-upstream.sh
> +++ w/t/t5523-push-upstream.sh
> @@ -124,14 +124,14 @@ test_expect_success TTY 'push --no-progress suppresses progress' '
> test_expect_success TTY 'quiet push' '
> ensure_fresh_upstream &&
>
> - test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
> + test_terminal git push --quiet --no-progress upstream main >output 2>&1 &&
> test_must_be_empty output
> '
>
> test_expect_success TTY 'quiet push -u' '
> ensure_fresh_upstream &&
>
> - test_terminal git push --quiet -u --no-progress upstream main 2>&1 | tee output &&
> + test_terminal git push --quiet -u --no-progress upstream main >output 2>&1 &&
> test_must_be_empty output
> '
>
Looks good.
Thanks.
next prev parent reply other threads:[~2024-08-09 0:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-08 21:19 [PATCH] tests: drop use of 'tee' that hides exit status Junio C Hamano
2024-08-09 0:37 ` Rubén Justo [this message]
2024-08-09 1:25 ` Junio C Hamano
2024-08-13 12:22 ` Johannes Schindelin
2024-08-13 12:59 ` Jeff King
2024-08-13 17:23 ` Junio C Hamano
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=93e6fdd3-4a15-4cc5-929a-aa5e79f44e1c@gmail.com \
--to=rjusto@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).