All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Paul Tan <pyokagan@gmail.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: Git List <git@vger.kernel.org>,
	Stefan Beller <sbeller@google.com>,
	Ramkumar Ramachandra <artagnon@gmail.com>
Subject: Re: [PATCH v2 11/12] t5524: test --log=1 limits shortlog length
Date: Thu, 07 May 2015 21:12:58 +0200	[thread overview]
Message-ID: <554BB93A.3090000@kdbg.org> (raw)
In-Reply-To: <CACRoPnRfqQMRJ5N=oL84SMw=FC=Eg-Co-De_9E9cpWCaaSZAxw@mail.gmail.com>

Am 07.05.2015 um 19:06 schrieb Paul Tan:
> Hi Dscho,
>
> On Fri, May 8, 2015 at 12:28 AM, Johannes Schindelin
> <johannes.schindelin@gmx.de> wrote:
>> Hi Paul,
>>
>> On 2015-05-07 10:44, Paul Tan wrote:
>>> @@ -32,4 +35,18 @@ test_expect_success pull '
>>>   )
>>>   '
>>>
>>> +test_expect_failure '--log=1 limits shortlog length' '
>>> +(
>>> +     cd cloned &&
>>> +     git reset --hard HEAD^ &&
>>> +     test `cat afile` = original &&
>>> +     test `cat bfile` = added &&
>>> +     git pull --log &&
>>> +     git log -3 &&
>>> +     git cat-file commit HEAD >result &&
>>> +     grep Dollar result &&
>>> +     ! grep "second commit" result
>>> +)
>>
>> I think it might be better to use `test_must_fail` here, just for
>> consistency (the `!` operator would also pass if `grep` itself could not
>> be executed correctly, quite academic, I know, given that `grep` is
>> exercised plenty of times by the test suite, but still...)
>>
>> What do you think?
>
> Yep, it's definitely better. Sometimes I forget about the existence of
> some test utility functions :-/.

Nope, it's not better. test_must_fail is explicitly only for git 
invocations. We do not expect 'grep' to segfault or something.

Cf. eg. 
http://thread.gmane.org/gmane.comp.version-control.git/258725/focus=258752

-- Hannes

  reply	other threads:[~2015-05-07 19:13 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-07  8:43 [PATCH v2 00/12] Improve git-pull test coverage Paul Tan
2015-05-07  8:43 ` [PATCH v2 01/12] t5520: implement tests for no merge candidates cases Paul Tan
2015-05-07  9:05   ` Torsten Bögershausen
2015-05-07 14:04     ` Junio C Hamano
2015-05-07 14:47       ` Paul Tan
2015-05-07 15:56         ` Junio C Hamano
2015-05-07 14:56       ` Torsten Bögershausen
2015-05-07  8:43 ` [PATCH v2 02/12] t5520: test for failure if index has unresolved entries Paul Tan
2015-05-07 18:28   ` Eric Sunshine
2015-05-12 13:43     ` Paul Tan
2015-05-07  8:43 ` [PATCH v2 03/12] t5520: test work tree fast-forward when fetch updates head Paul Tan
2015-05-07 16:23   ` Stefan Beller
2015-05-07 17:12   ` Junio C Hamano
2015-05-07 17:32     ` Paul Tan
2015-05-07  8:44 ` [PATCH v2 04/12] t5520: test --rebase with multiple branches Paul Tan
2015-05-07  8:44 ` [PATCH v2 05/12] t5520: test --rebase failure on unborn branch with index Paul Tan
2015-05-07 16:32   ` Stefan Beller
2015-05-07 17:44     ` Paul Tan
2015-05-07 18:20       ` Eric Sunshine
2015-05-07  8:44 ` [PATCH v2 06/12] t5521: test --dry-run does not make any changes Paul Tan
2015-05-07  8:44 ` [PATCH v2 07/12] t4013: call git-merge instead of git-pull Paul Tan
2015-05-07 16:26   ` Johannes Schindelin
2015-05-07 16:55     ` Paul Tan
2015-05-08 13:12       ` Johannes Schindelin
2015-05-07 17:17     ` Junio C Hamano
2015-05-07  8:44 ` [PATCH v2 08/12] t5520: ensure origin refs are updated Paul Tan
2015-05-07  8:44 ` [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase" Paul Tan
2015-05-07 17:24   ` Junio C Hamano
2015-05-07 18:17     ` Paul Tan
2015-05-07 20:15       ` Junio C Hamano
2015-05-10  8:19         ` Paul Tan
2015-05-07  8:44 ` [PATCH v2 10/12] t5520: failing test for pull --all with no configured upstream Paul Tan
2015-05-07 17:38   ` Junio C Hamano
2015-05-07 18:05     ` Paul Tan
2015-05-07 18:48       ` Junio C Hamano
2015-05-09  3:10         ` Paul Tan
2015-05-07  8:44 ` [PATCH v2 11/12] t5524: test --log=1 limits shortlog length Paul Tan
2015-05-07 16:28   ` Johannes Schindelin
2015-05-07 17:06     ` Paul Tan
2015-05-07 19:12       ` Johannes Sixt [this message]
2015-05-08 10:07         ` Johannes Schindelin
2015-05-08 10:59           ` Thomas Gummerer
2015-05-08 13:09             ` Johannes Schindelin
2015-05-08 17:19           ` Johannes Sixt
2015-05-08 17:32             ` Junio C Hamano
2015-05-07 17:28   ` Junio C Hamano
2015-05-07  8:44 ` [PATCH v2 12/12] t5520: check reflog action in fast-forward merge Paul Tan
2015-05-07 16:39   ` Stefan Beller
2015-05-07 19:01 ` [PATCH v2 00/12] Improve git-pull test coverage 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=554BB93A.3090000@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=pyokagan@gmail.com \
    --cc=sbeller@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.