From: "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
To: Eric Sunshine <sunshine@sunshineco•com>
Cc: Christian Couder <christian.couder@gmail•com>,
Git List <git@vger•kernel.org>,
Junio C Hamano <gitster@pobox•com>,
Andreas Schwab <schwab@suse•de>,
Christian Couder <chriscool@tuxfamily•org>
Subject: Re: [PATCH 2/3] t6050: redirect expected error output to /dev/null
Date: Thu, 28 Mar 2019 21:22:35 +0100 [thread overview]
Message-ID: <87va02agvo.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <CAPig+cSj5WZeGy4nwgafGtBbz7y921M8H57eFbBXwRy2Bm-C+g@mail.gmail.com>
On Thu, Mar 28 2019, Eric Sunshine wrote:
> On Thu, Mar 28, 2019 at 1:17 PM Christian Couder
> <christian.couder@gmail•com> wrote:
>> Otherwise the error from `git rev-parse` is uselessly
>> polluting the debug output.
>>
>> Signed-off-by: Christian Couder <chriscool@tuxfamily•org>
>> ---
>> diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
>> @@ -40,7 +40,7 @@ commit_peeling_shows_parents ()
>> - test_must_fail git rev-parse --verify $_commit^$_parent_number
>> + test_must_fail git rev-parse --verify $_commit^$_parent_number 2>/dev/null
>
> When I'm debugging test failures, I find it very helpful to see that a
> command which was expected to fail did indeed fail with the expected
> error message, so I don't consider such a message as "uselessly
> polluting the debug output". Consequently, I'm rather negative on this
> change.
I believe this instead should make both of you happy:
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index d638119750..2e3009f3cb 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -40,7 +40,8 @@ commit_peeling_shows_parents ()
test "$_found" = "$_parent" || return 1
_parent_number=$(( $_parent_number + 1 ))
done &&
- test_must_fail git rev-parse --verify $_commit^$_parent_number
+ test_must_fail git rev-parse --verify $_commit^$_parent_number 2>err &&
+ test_i18ngrep "Needed a single revision" err
}
commit_has_parents ()
Note that the file has existing 4-space-instead-of-tabs issues.
next prev parent reply other threads:[~2019-03-28 20:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-28 17:17 [PATCH 1/3] t6050: use test_line_count instead of wc -l Christian Couder
2019-03-28 17:17 ` [PATCH 2/3] t6050: redirect expected error output to /dev/null Christian Couder
2019-03-28 18:41 ` Eric Sunshine
2019-03-28 20:22 ` Ævar Arnfjörð Bjarmason [this message]
2019-03-28 17:17 ` [PATCH 3/3] replace: fix --graft when passing a tag Christian Couder
2019-03-28 18:38 ` Taylor Blau
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=87va02agvo.fsf@evledraar.gmail.com \
--to=avarab@gmail$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=schwab@suse$(echo .)de \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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