git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
	Jeff King <peff@peff.net>
Subject: Re: [PATCH v2 1/2] t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
Date: Wed, 14 Mar 2012 15:17:28 -0700	[thread overview]
Message-ID: <7v8vj2omiv.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1331734704-14281-1-git-send-email-zbyszek@in.waw.pl> ("Zbigniew Jędrzejewski-Szmek"'s message of "Wed, 14 Mar 2012 15:18:23 +0100")

Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> writes:

> t0300-credential-helpers.sh requires GIT_TEST_CREDENTIAL_HELPER to be
> configured to do something sensible. If it is not set, prove will say:
>   ./t0303-credential-external.sh .. skipped: (no reason given)
> which isn't very nice.
>
> Use skip_all="..." && test_done to bail out immediately and provide a
> nicer message. In case GIT_TEST_CREDENTIAL_HELPER is set, but the
> timeout tests are skipped, mention GIT_TEST_CREDENTIAL_HELPER_TIMEOUT.
>
> Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
> ---
>  t/t0303-credential-external.sh |   40 ++++++++++++++++------------------------
>  1 files changed, 16 insertions(+), 24 deletions(-)
>
> diff --git a/t/t0303-credential-external.sh b/t/t0303-credential-external.sh
> index 267f4c8..4479bf8 100755
> --- a/t/t0303-credential-external.sh
> +++ b/t/t0303-credential-external.sh
> @@ -4,36 +4,28 @@ test_description='external credential helper tests'
>  . ./test-lib.sh
>  . "$TEST_DIRECTORY"/lib-credential.sh
>  
> -pre_test() {
> -	test -z "$GIT_TEST_CREDENTIAL_HELPER_SETUP" ||
> -	eval "$GIT_TEST_CREDENTIAL_HELPER_SETUP"
> -
> -	# clean before the test in case there is cruft left
> -	# over from a previous run that would impact results
> -	helper_test_clean "$GIT_TEST_CREDENTIAL_HELPER"
> -}
> -
> -post_test() {
> -	# clean afterwards so that we are good citizens
> -	# and don't leave cruft in the helper's storage, which
> -	# might be long-term system storage
> -	helper_test_clean "$GIT_TEST_CREDENTIAL_HELPER"
> -}
> -
>  if test -z "$GIT_TEST_CREDENTIAL_HELPER"; then
> -	say "# skipping external helper tests (set GIT_TEST_CREDENTIAL_HELPER)"
> -else
> -	pre_test
> -	helper_test "$GIT_TEST_CREDENTIAL_HELPER"
> -	post_test
> +	skip_all="used to test external credential helpers"
> +	test_done
>  fi
>  
> +$GIT_TEST_CREDENTIAL_HELPER_SETUP

This used to be 'test -z "$it" || eval "$it"'; doesn't it make a
difference?

What is the value expected to be in this variable?  Nobody seems to set it
in our codebase, so I cannot say "with the current code, this rewrite is
safe" or anything like that.

This is probably not related to your patch, but

	GIT_TEST_CREDENTIAL_HELPER=cache sh t0303-*.sh

passes OK for me while

	make GIT_TEST_CREDENTIAL_HELPER=cache T=t0303-*.sh prove

seems to get stuck forever.

  parent reply	other threads:[~2012-03-14 22:17 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-12 12:05 [PATCH 0/2] prettify t0303-credential-helpers.sh Zbigniew Jędrzejewski-Szmek
2012-03-12 12:05 ` [PATCH 1/2] t0303: set reason for skipping tests Zbigniew Jędrzejewski-Szmek
2012-03-12 12:30   ` Jeff King
2012-03-12 21:07     ` Zbigniew Jędrzejewski-Szmek
2012-03-13 21:53       ` Jeff King
2012-03-14 14:14         ` Zbigniew Jędrzejewski-Szmek
2012-03-14 14:18           ` [PATCH v2 1/2] t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER Zbigniew Jędrzejewski-Szmek
2012-03-14 14:18             ` [PATCH v2 2/2] t0303: resurrect commit message as test documentation Zbigniew Jędrzejewski-Szmek
2012-03-14 22:17             ` Junio C Hamano [this message]
2012-03-15  3:54               ` [PATCH v2 1/2] t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER Jeff King
2012-03-15  6:55                 ` Junio C Hamano
2012-03-15 10:44                   ` Zbigniew Jędrzejewski-Szmek
2012-03-15 11:08                     ` [PATCH v3 " Zbigniew Jędrzejewski-Szmek
2012-03-15 11:08                       ` [PATCH v3 2/2] t0303: resurrect commit message as test documentation Zbigniew Jędrzejewski-Szmek
2012-03-15 17:51                       ` [PATCH v3 1/2] t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER Junio C Hamano
2012-03-15 13:24                   ` [PATCH v2 " Jeff King
2012-03-15 13:26                     ` Jeff King
2012-03-15 17:50                       ` Junio C Hamano
2012-03-15  3:56             ` Jeff King
2012-03-12 12:05 ` [PATCH 2/2] t0303: resurrect commit message as test documentation Zbigniew Jędrzejewski-Szmek
2012-03-12 12:31   ` Jeff King
2012-03-12 20:43   ` Jonathan Nieder
2012-03-13 21:38     ` Jeff King

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=7v8vj2omiv.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=zbyszek@in.waw.pl \
    /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).