From: Jeff King <peff@peff.net>
To: Henning Schild <henning.schild@siemens.com>
Cc: git@vger.kernel.org, "Eric Sunshine" <sunshine@sunshineco.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"Ben Toews" <mastahyeti@gmail.com>,
"Taylor Blau" <me@ttaylorr.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH v2 4/9] t/t7510: check the validation of the new config gpg.format
Date: Tue, 10 Jul 2018 11:55:36 -0400 [thread overview]
Message-ID: <20180710155536.GB23624@sigill.intra.peff.net> (raw)
In-Reply-To: <b02154496033220897f6f773e1149a98b21ccba7.1531208187.git.henning.schild@siemens.com>
On Tue, Jul 10, 2018 at 10:52:26AM +0200, Henning Schild wrote:
> diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
> index 6e2015ed9..7e1e9caf4 100755
> --- a/t/t7510-signed-commit.sh
> +++ b/t/t7510-signed-commit.sh
> @@ -227,4 +227,14 @@ test_expect_success GPG 'log.showsignature behaves like --show-signature' '
> grep "gpg: Good signature" actual
> '
>
> +test_expect_success GPG 'check config gpg.format values' '
> + rm .git/config &&
> + test_config gpg.format openpgp &&
> + git commit -S --amend -m "success" &&
You shouldn't need this "rm" here. test_config will add your config, and
then delete it after the test finishes.
I know you probably saw that in t1300 or nearby tests, but IMHO they are
wrong to do so. It's a historical wart that should be cleaned up.
> + test_config gpg.format OpEnPgP &&
> + git commit -S --amend -m "success" &&
A bit of a funny side effect is that we'll unset gpg.format three times
at the end of the test, since each test_config doesn't know that the
earlier invocations touched the same variable.
It's probably not worth addressing, but we could do it with an explicit:
test_when_finished "test_unconfig gpg.format" &&
git config gpg.format openpgp &&
...
git config gpg.format OpEnPgP &&
Or alternatively, this could be three independent tests, which would
give the opportunity to describe each.
> + test_config gpg.format malformed &&
> + test_must_fail git commit -S --amend -m "fail" 2>result
> +'
If you're not going to look at the saved "result", we are better to just
leave stderr un-redirected. It will go to /dev/null by default, or to
the user-visible output of the test is run in verbose mode.
-Peff
next prev parent reply other threads:[~2018-07-10 15:55 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 8:52 [PATCH v2 0/9] X509 (gpgsm) commit signing support Henning Schild
2018-07-10 8:52 ` [PATCH v2 1/9] builtin/receive-pack: use check_signature from gpg-interface Henning Schild
2018-07-10 8:52 ` [PATCH v2 2/9] gpg-interface: make parse_gpg_output static and remove from interface header Henning Schild
2018-07-10 16:47 ` Junio C Hamano
2018-07-11 8:41 ` Henning Schild
2018-07-10 8:52 ` [PATCH v2 3/9] gpg-interface: add new config to select how to sign a commit Henning Schild
2018-07-10 15:56 ` Jeff King
2018-07-10 8:52 ` [PATCH v2 4/9] t/t7510: check the validation of the new config gpg.format Henning Schild
2018-07-10 15:55 ` Jeff King [this message]
2018-07-11 8:02 ` Henning Schild
2018-07-10 16:54 ` Junio C Hamano
2018-07-11 8:47 ` Henning Schild
2018-07-10 8:52 ` [PATCH v2 5/9] gpg-interface: introduce an abstraction for multiple gpg formats Henning Schild
2018-07-10 16:23 ` Jeff King
2018-07-13 8:41 ` Henning Schild
2018-07-10 17:16 ` Junio C Hamano
2018-07-13 8:41 ` Henning Schild
2018-07-10 8:52 ` [PATCH v2 6/9] gpg-interface: do not hardcode the key string len anymore Henning Schild
2018-07-10 15:49 ` Jeff King
2018-07-11 8:54 ` Henning Schild
2018-07-11 12:34 ` Jeff King
2018-07-11 13:46 ` Henning Schild
2018-07-11 14:27 ` Jeff King
2018-07-11 16:15 ` Henning Schild
2018-07-11 16:38 ` Jeff King
2018-07-10 8:52 ` [PATCH v2 7/9] gpg-interface: introduce new config to select per gpg format program Henning Schild
2018-07-10 16:54 ` Jeff King
2018-07-10 16:56 ` Jeff King
2018-07-14 18:13 ` brian m. carlson
2018-07-16 21:35 ` Jeff King
2018-07-16 21:56 ` Junio C Hamano
2018-07-16 22:23 ` Jeff King
2018-07-16 23:12 ` Junio C Hamano
2018-07-10 17:29 ` Junio C Hamano
2018-07-13 8:41 ` Henning Schild
2018-07-10 8:52 ` [PATCH v2 8/9] gpg-interface: introduce new signature format "x509" using gpgsm Henning Schild
2018-07-10 17:01 ` Jeff King
2018-07-10 17:40 ` Junio C Hamano
2018-07-10 17:50 ` Jeff King
2018-07-11 9:18 ` Henning Schild
2018-07-10 8:52 ` [PATCH v2 9/9] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
2018-07-10 17:09 ` Jeff King
2018-07-10 17:16 ` Jeff King
2018-07-11 10:38 ` Henning Schild
2018-07-11 12:51 ` Jeff King
2018-07-11 13:40 ` Henning Schild
2018-07-11 14:35 ` Jeff King
2018-07-11 15:48 ` Henning Schild
2018-07-11 16:26 ` Junio C Hamano
2018-07-14 18:26 ` brian m. carlson
2018-07-10 21:12 ` Junio C Hamano
2018-07-11 10:38 ` Henning Schild
2018-07-11 14:33 ` Jeff King
2018-07-11 16:35 ` Henning Schild
2018-07-10 17:12 ` [PATCH v2 0/9] X509 (gpgsm) commit signing support Jeff King
2018-07-14 18:33 ` brian m. carlson
2018-07-16 21:32 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180710155536.GB23624@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=henning.schild@siemens.com \
--cc=martin.agren@gmail.com \
--cc=mastahyeti@gmail.com \
--cc=me@ttaylorr.com \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).