git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: santiago@nyu.edu
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags
Date: Sun, 3 Apr 2016 00:40:55 -0400	[thread overview]
Message-ID: <20160403044054.GB1519@sigill.intra.peff.net> (raw)
In-Reply-To: <1459638975-17705-3-git-send-email-santiago@nyu.edu>

On Sat, Apr 02, 2016 at 07:16:13PM -0400, santiago@nyu.edu wrote:

> The verify-tag command supports mutliple tag names as an argument.

s/mutliple/multiple/

> +test_expect_success GPG 'verify multiple tags' '
> +	git verify-tag -v --raw fourth-signed sixth-signed seventh-signed 2>actual 1> tagnames &&

Style: we don't put a space between ">" and the filename. Also, we
usually omit "1" when redirecting stdout.

> +		grep -c "GOODSIG" actual > count &&

Funny indentation here.

I wondered if we could use test_cmp instead of a counting grep here, but
this is looking at gpg spew, and we probably don't want to count on that
never changing.

I don't see us actually verifying that "count" is 3, though.

> +		! grep "BADSIG" actual &&

Makes sense...

> +		grep -E "tag\ .*" tagnames | uniq -u | wc - l | grep "3"

Do we need "grep -E" here? I don't see any extended regex in use. Is
there a reason to backslash-escape the space?

Your "wc -l" has an extra space, which means "read stdin, and then the
file 'l'". Which sort-of happens to work, except as you noticed, you
have to grep for "3" instead of matching it.

I think, though, that rather than counting we could just write what we
expect into a file and compare that. It makes it easier for somebody
reading the test to see what it is we're trying to do.

In fact, I suspect you could replace the "GOODSIG" check as well by
doing something like:

  # verifying 3 tags in one invocation should be exactly like
  # verifying the 3 separately
  tags="fourth-signed sixth-signed seventh-signed"
  for i in $tags; do
          git verify-tag -v --raw $i || return 1
  done >expect.stdout 2>expect.stderr &&
  git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr &&
  test_cmp expect.stdout actual.stdout &&
  test_cmp expect.stderr actual.stderr

but I didn't test it.

-Peff

  reply	other threads:[~2016-04-03  4:41 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-02 23:16 [PATCH v3 0/4] tag: move PGP verification code to tag.c santiago
2016-04-02 23:16 ` [PATCH v3 1/4] builtin/verify-tag.c: Ignore SIGPIPE on gpg-interface santiago
2016-04-03  4:30   ` Jeff King
2016-04-03  6:50   ` Johannes Sixt
2016-04-03 21:46     ` Santiago Torres
2016-04-02 23:16 ` [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags santiago
2016-04-03  4:40   ` Jeff King [this message]
2016-04-03  7:59     ` Eric Sunshine
2016-04-03 13:07       ` Jeff King
2016-04-03 21:58         ` Santiago Torres
2016-04-04  1:38           ` Eric Sunshine
2016-04-04 13:41             ` Jeff King
2016-04-02 23:16 ` [PATCH v3 3/4] builtin/verify-tag: move verification code to tag.c santiago
2016-04-03  4:45   ` Jeff King
2016-04-03  8:11     ` Eric Sunshine
2016-04-03  8:19   ` Eric Sunshine
2016-04-03 21:53     ` Santiago Torres
2016-04-02 23:16 ` [PATCH v3 4/4] tag: use pgp_verify_function in tag -v call santiago
2016-04-03  4:56   ` Jeff King
2016-04-03 21:43     ` Santiago Torres
2016-04-04  4:12     ` Santiago Torres
2016-04-04 13:38       ` Jeff King
2016-04-04 18:24         ` Santiago Torres
2016-04-04 20:19           ` 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=20160403044054.GB1519@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=santiago@nyu.edu \
    --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.
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).