From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Hans Jerry Illikainen <hji@dyntopia.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v1 1/2] t: increase test coverage of signature verification output
Date: Sun, 15 Mar 2020 00:25:40 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2003150020010.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200304114804.19108-2-hji@dyntopia.com>
Hi Hans,
I was wondering why your patches made the CI/PR builds fail on macOS and
Windows. This was a pretty hard thing to figure out, see below:
On Wed, 4 Mar 2020, Hans Jerry Illikainen wrote:
> diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
> index 8a72b4c43a..1922c1c42e 100755
> --- a/t/t6200-fmt-merge-msg.sh
> +++ b/t/t6200-fmt-merge-msg.sh
> @@ -6,6 +6,7 @@
> test_description='fmt-merge-msg test'
>
> . ./test-lib.sh
> +. "$TEST_DIRECTORY/lib-gpg.sh"
>
> test_expect_success setup '
> echo one >one &&
> @@ -73,6 +74,10 @@ test_expect_success setup '
> apos="'\''"
> '
>
> +test_expect_success GPG '
For developers who are very familiar with Git's test suite, it is really
hard to spot what is wrong with this line, and I was fooled for quite a
few days, too.
The thing is that this `GPG` looks like an innocent prereq and it is
correct: this test case really depends on GPG being present and working.
But it is not a prereq.
This is used as the _title_ of the test case. And on the macOS/Windows
agents, the GPG prereq is not met.
The reason is that this `test_expect_success` call only receives two
arguments, so it does not interpret the first one as a prereq. But I think
that this `GPG` was actually intended as a prereq, so the test case's
title is missing.
Could you kindly change this patch so that it adds a title, e.g. `set up
signed tag`?
That should let the CI build pass again.
Thank you,
Dscho
> + git tag -s -m signed-tag-msg signed-good-tag left
> +'
> +
> test_expect_success 'message for merging local branch' '
> echo "Merge branch ${apos}left${apos}" >expected &&
>
> @@ -83,6 +88,24 @@ test_expect_success 'message for merging local branch' '
> test_cmp expected actual
> '
>
> +test_expect_success GPG 'message for merging local tag signed by good key' '
> + git checkout master &&
> + git fetch . signed-good-tag &&
> + git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
> + grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
> + grep "^# gpg: Signature made" actual &&
> + grep "^# gpg: Good signature from" actual
> +'
> +
> +test_expect_success GPG 'message for merging local tag signed by unknown key' '
> + git checkout master &&
> + git fetch . signed-good-tag &&
> + GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
> + grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
> + grep "^# gpg: Signature made" actual &&
> + grep "^# gpg: Can${apos}t check signature: \(public key not found\|No public key\)" actual
> +'
> +
> test_expect_success 'message for merging external branch' '
> echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
>
> --
> 2.25.1.709.g558d21736a
>
>
>
next prev parent reply other threads:[~2020-03-15 2:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 17:48 [PATCH 0/1] gpg-interface: prefer check_signature() for GPG verification Hans Jerry Illikainen
2019-11-27 17:48 ` [PATCH 1/1] " Hans Jerry Illikainen
2019-11-30 21:57 ` Junio C Hamano
2020-03-04 11:48 ` [PATCH v1 0/2] " Hans Jerry Illikainen
2020-03-04 11:48 ` [PATCH v1 1/2] t: increase test coverage of signature verification output Hans Jerry Illikainen
2020-03-14 23:25 ` Johannes Schindelin [this message]
2020-03-15 16:40 ` Junio C Hamano
2020-03-04 11:48 ` [PATCH v1 2/2] gpg-interface: prefer check_signature() for GPG verification Hans Jerry Illikainen
2020-03-05 18:44 ` [PATCH v1 0/2] " Junio C Hamano
2020-03-06 11:59 ` Johannes Schindelin
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=nycvar.QRO.7.76.6.2003150020010.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=hji@dyntopia.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).