From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git mailing list <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: Re: [PATCH 04/11] t3030-merge-recursive: don't check the stderr of a subshell
Date: Tue, 27 Feb 2018 22:28:45 +0100 [thread overview]
Message-ID: <CAM0VKjnVWZ8Ysp5YyfcStgcBuME0q=usT5MKiAcWyxDwAKk+Fg@mail.gmail.com> (raw)
In-Reply-To: <xmqqpo4qp290.fsf@gitster-ct.c.googlers.com>
On Tue, Feb 27, 2018 at 10:10 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> SZEDER Gábor <szeder.dev@gmail.com> writes:
>>
>>> The two test checking 'git mmerge-recursive' in an empty worktree in
>>> ...
>>> GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
>>> export GIT_INDEX_FILE &&
>>> mkdir "$GIT_WORK_TREE" &&
>>> - git read-tree -i -m $c7 &&
>>> - git update-index --ignore-missing --refresh &&
>>> - git merge-recursive $c0 -- $c7 $c3 &&
>>> - git ls-files -s >actual-files
>>> - ) 2>actual-err &&
>>> - >expected-err &&
>>> + git read-tree -i -m $c7 2>actual-err &&
>>> + test_must_be_empty expected-err &&
>>> + git update-index --ignore-missing --refresh 2>actual-err &&
>>> + test_must_be_empty expected-err &&
>>> + git merge-recursive $c0 -- $c7 $c3 2>actual-err &&
>>> + test_must_be_empty expected-err &&
>>> + git ls-files -s >actual-files 2>actual-err &&
>>> + test_must_be_empty expected-err
>>
>> Where do the contents of all of these expected-err files come from?
>> Should all of the test_must_be_empty checks be checking actual-err
>> instead?
Ugh, I messed that up.
> And the reason why your pre-submission testing did not catch may be
> because test_must_be_empty is broken? I wonder if this is a good
> way forward to catch a possible bug like this.
Yeah. 'test -s file' means "exists and has a size greater than zero",
so the missing file doesn't trigger the error code path.
> Of course, if somebody was using the helepr for "must be either
> missing or empty", this change will break it, but I somehow doubt
> it.
FWIW, I just run the test suite with this change added, and there were
no failures. I think it's a good change.
> A program that creates/opens and writes an error message only
> when an error is detected is certainly possible, and could be tested
> with the current test_must_be_empty this way:
>
> rm -f actual-err &&
> git frotz --error-to=actual-err &&
> test_must_be_empty actual-err
>
> but then the last step in such a test like the above is more natural
> to check if actual-err _exists_ in the first place anyway, so...
>
> t/test-lib-functions.sh | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> index 37eb34044a..6cfbee60e4 100644
> --- a/t/test-lib-functions.sh
> +++ b/t/test-lib-functions.sh
> @@ -772,7 +772,11 @@ verbose () {
> # otherwise.
>
> test_must_be_empty () {
> - if test -s "$1"
> + if ! test -f "$1"
> + then
> + echo "'$1' is missing"
> + return 1
> + elif test -s "$1"
> then
> echo "'$1' is not empty, it contains:"
> cat "$1"
next prev parent reply other threads:[~2018-02-27 21:28 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-23 23:39 [PATCH 00/11] Make the test suite pass with '-x' and /bin/sh SZEDER Gábor
2018-02-23 23:39 ` [PATCH 01/11] t: prevent '-x' tracing from interfering with test helpers' stderr SZEDER Gábor
2018-02-24 12:19 ` SZEDER Gábor
2018-02-25 13:40 ` [PATCH v1.1] " SZEDER Gábor
2018-02-23 23:39 ` [PATCH 02/11] t: add means to disable '-x' tracing for individual test scripts SZEDER Gábor
2018-02-23 23:39 ` [PATCH 03/11] t1507-rev-parse-upstream: don't check the stderr of a shell function SZEDER Gábor
2018-02-23 23:39 ` [PATCH 04/11] t3030-merge-recursive: don't check the stderr of a subshell SZEDER Gábor
2018-02-24 8:04 ` Eric Sunshine
2018-02-27 21:03 ` Junio C Hamano
2018-02-27 21:10 ` Junio C Hamano
2018-02-27 21:27 ` [PATCH] test_must_be_empty: make sure the file exists, not just empty Junio C Hamano
2018-02-27 21:42 ` Stefan Beller
2018-02-27 22:08 ` Jeff King
2018-02-27 21:28 ` SZEDER Gábor [this message]
2018-02-27 21:17 ` [PATCH 04/11] t3030-merge-recursive: don't check the stderr of a subshell Junio C Hamano
2018-02-28 0:44 ` SZEDER Gábor
2018-02-23 23:39 ` [PATCH 05/11] t5500-fetch-pack: " SZEDER Gábor
2018-02-23 23:39 ` [PATCH 06/11] t5526: use $TRASH_DIRECTORY to specify the path of GIT_TRACE log file SZEDER Gábor
2018-02-23 23:39 ` [PATCH 07/11] t5570-git-daemon: don't check the stderr of a subshell SZEDER Gábor
2018-02-23 23:39 ` [PATCH 08/11] t9903-bash-prompt: don't check the stderr of __git_ps1() SZEDER Gábor
2018-02-23 23:39 ` [PATCH 09/11] t1510-repo-setup: mark as untraceable with '-x' SZEDER Gábor
2018-02-23 23:39 ` [PATCH 10/11] t/README: add a note about don't saving stderr of compound commands SZEDER Gábor
2018-02-23 23:39 ` [PATCH 11/11] travis-ci: run tests with '-x' tracing SZEDER Gábor
2018-03-02 15:32 ` [PATCH 00/11] Make the test suite pass with '-x' and /bin/sh SZEDER Gábor
2018-03-03 7:12 ` Jeff King
2018-03-05 21:18 ` SZEDER Gábor
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='CAM0VKjnVWZ8Ysp5YyfcStgcBuME0q=usT5MKiAcWyxDwAKk+Fg@mail.gmail.com' \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).