git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: git@vger.kernel.org
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Martin Ågren" <martin.agren@gmail.com>,
	"Ben Toews" <mastahyeti@gmail.com>, "Jeff King" <peff@peff.net>,
	"Taylor Blau" <me@ttaylorr.com>,
	"brian m . carlson" <sandals@crustytoothpaste.net>,
	"Henning Schild" <henning.schild@siemens.com>
Subject: [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests
Date: Thu, 19 Jul 2018 14:14:09 +0200	[thread overview]
Message-ID: <20180719121409.6143-1-henning.schild@siemens.com> (raw)
In-Reply-To: <xmqqbmb4lbhh.fsf@gitster-ct.c.googlers.com>

Unsetting the varibale for good can have unwanted effects for new
tests added in the future It also meant we needed to hardcode the
value for "user.signingkey".
Move the unset into a subshell, get rid of the hardcoded
"committer@example.com", and switch the GPG variant to using test_config
just like GPGSM.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 t/t5534-push-signed.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 0cb88aa6f..f6d674156 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -194,10 +194,12 @@ test_expect_success GPG 'fail without key and heed user.signingkey' '
 
 	EOF
 
-	unset GIT_COMMITTER_EMAIL &&
-	git config user.email hasnokey@nowhere.com &&
-	test_must_fail git push --signed dst noop ff +noff &&
-	git config user.signingkey committer@example.com &&
+	test_config user.email hasnokey@nowhere.com &&
+	(
+		unset GIT_COMMITTER_EMAIL &&
+		test_must_fail git push --signed dst noop ff +noff
+	) &&
+	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
 	git push --signed dst noop ff +noff &&
 
 	(
@@ -241,11 +243,14 @@ test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
 	E_O_F
 
 	EOF
-	unset GIT_COMMITTER_EMAIL &&
+
 	test_config user.email hasnokey@nowhere.com &&
 	test_config user.signingkey "" &&
-	test_must_fail git push --signed dst noop ff +noff &&
-	test_config user.signingkey committer@example.com &&
+	(
+		unset GIT_COMMITTER_EMAIL &&
+		test_must_fail git push --signed dst noop ff +noff
+	) &&
+	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
 	git push --signed dst noop ff +noff &&
 
 	(
-- 
2.16.4


  reply	other threads:[~2018-07-19 12:14 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-17 12:50 [PATCH v4 0/7] X509 (gpgsm) commit signing support Henning Schild
2018-07-17 12:50 ` [PATCH v4 1/7] gpg-interface: add new config to select how to sign a commit Henning Schild
2018-07-17 12:50 ` [PATCH v4 2/7] t/t7510: check the validation of the new config gpg.format Henning Schild
2018-07-17 21:31   ` Junio C Hamano
2018-07-18 10:36     ` Henning Schild
2018-07-18  9:30   ` [PATCH v5 " Henning Schild
2018-07-17 12:50 ` [PATCH v4 3/7] gpg-interface: introduce an abstraction for multiple gpg formats Henning Schild
2018-07-17 20:56   ` Junio C Hamano
2018-07-17 12:50 ` [PATCH v4 4/7] gpg-interface: do not hardcode the key string len anymore Henning Schild
2018-07-17 20:56   ` Junio C Hamano
2018-07-17 12:50 ` [PATCH v4 5/7] gpg-interface: introduce new config to select per gpg format program Henning Schild
2018-07-17 12:50 ` [PATCH v4 6/7] gpg-interface: introduce new signature format "x509" using gpgsm Henning Schild
2018-07-17 12:50 ` [PATCH v4 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
2018-07-17 21:31   ` Junio C Hamano
2018-07-18 10:36     ` Henning Schild
2018-07-18 17:06       ` Junio C Hamano
2018-07-19 12:14         ` Henning Schild [this message]
2018-07-19 12:15           ` [PATCH] t/t5534: do not unset GIT_COMMITTER_EMAIL for other tests Henning Schild
2018-07-19 22:27             ` Junio C Hamano
2018-07-20  8:28               ` Henning Schild
2018-07-19 15:10           ` Taylor Blau
2018-07-18  9:31   ` [PATCH v5 7/7] gpg-interface t: extend the existing GPG tests with GPGSM Henning Schild
2018-07-20  8:28     ` [PATCH v6 " Henning Schild
2018-07-20 15:42       ` 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

  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=20180719121409.6143-1-henning.schild@siemens.com \
    --to=henning.schild@siemens.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.agren@gmail.com \
    --cc=mastahyeti@gmail.com \
    --cc=me@ttaylorr.com \
    --cc=peff@peff.net \
    --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).