From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] t5801 (remote-helpers): cleanup environment sets
Date: Sun, 20 Apr 2014 15:15:43 -0700 [thread overview]
Message-ID: <7vy4yzk5ps.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1398019417-8520-1-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Sun, 20 Apr 2014 13:43:37 -0500")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> Commit 512477b (tests: use "env" to run commands with temporary env-var
> settings) missed some variables in the remote-helpers test. Also
> standardize these.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Good. I was wondering about these myself when juggling some series
that touched this file the other day.
Will queue. Thanks.
> ---
> t/t5801-remote-helpers.sh | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
> index 25fd2e7..42d1c66 100755
> --- a/t/t5801-remote-helpers.sh
> +++ b/t/t5801-remote-helpers.sh
> @@ -212,19 +212,17 @@ test_expect_success 'push update refs failure' '
> echo "update fail" >>file &&
> git commit -a -m "update fail" &&
> git rev-parse --verify testgit/origin/heads/update >expect &&
> - GIT_REMOTE_TESTGIT_PUSH_ERROR="non-fast forward" &&
> - export GIT_REMOTE_TESTGIT_PUSH_ERROR &&
> - test_expect_code 1 git push origin update &&
> + test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
> + git push origin update &&
> git rev-parse --verify testgit/origin/heads/update >actual &&
> test_cmp expect actual
> )
> '
>
> test_expect_success 'proper failure checks for fetching' '
> - (GIT_REMOTE_TESTGIT_FAILURE=1 &&
> - export GIT_REMOTE_TESTGIT_FAILURE &&
> - cd local &&
> - test_must_fail git fetch 2> error &&
> + (cd local &&
> + test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 \
> + git fetch 2> error &&
> cat error &&
> grep -q "Error while running fast-import" error
> )
> @@ -232,7 +230,8 @@ test_expect_success 'proper failure checks for fetching' '
>
> test_expect_success 'proper failure checks for pushing' '
> (cd local &&
> - test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all
> + test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 \
> + git push --all
> )
> '
prev parent reply other threads:[~2014-04-20 22:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-20 18:43 [PATCH] t5801 (remote-helpers): cleanup environment sets Felipe Contreras
2014-04-20 22:15 ` Junio C Hamano [this message]
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=7vy4yzk5ps.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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).