From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 1/1] fetch: let --jobs=<n> parallelize --multiple, too
Date: Sat, 5 Oct 2019 00:03:43 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1910042356450.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqftk9870h.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Fri, 4 Oct 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > +test_expect_success 'parallel' '
> > + git remote add one ./bogus1 &&
> > + git remote add two ./bogus2 &&
> > +
> > + test_must_fail env GIT_TRACE="$PWD/trace" \
> > + git fetch --jobs=2 --multiple one two 2>err &&
> > + grep "2 tasks" trace &&
>
> I think this one expects to match this in run-command.c:
>
> trace_printf("run_processes_parallel: preparing to run up to %d tasks", n);
>
> > + grep "one.*128" err &&
> > + grep "two.*128" err
>
> and these expect to match this in fetch.c
>
> strbuf_addf(out, _("could not fetch '%s' (exit code: %d)\n"),
>
> It would have been nice to fellow contributors, if the grep patterns
> were written a bit more tightly. It would allow people who debug
> test failure to more easily identify which message the patterns are
> trying to catch.
This is a two-edged sword: when those messages change (for whatever
reason), the regression test will fail, too, but it actually wants to
test the parallel fetch, not the trace message of
`run_processes_parallel`.
So I tried to prevent such an unactionable regression test failure. But
I see your reasoning, and I now thought about it and consider those
error messages to be rather stable.
Will fix.
> In any case, the latter two needs to be guarded against
> gettext-poison, I would think. Without addressing the vagueness of
> the pattern, at least the following needs to be squashed to help the
> CI.
Indeed. I missed this because the GitGitGadget PR build was all green.
My guess is that I messed up the definition of that PR build (it is
_not_ what's in `azure-pipelines.yml` because that would not work
correctly when PRs target older commits). I _think_ I fixed it by
setting `export GIT_TEST_GETTEXT_POISON=true` explicitly (previously I
only set the `jobname`, expecting `ci/run-build-and-tests.sh` to pick up
on that.
Thanks,
Dscho
>
> Thanks.
>
> ---
> t/t5514-fetch-multiple.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh
> index cce829b989..33f5220a53 100755
> --- a/t/t5514-fetch-multiple.sh
> +++ b/t/t5514-fetch-multiple.sh
> @@ -190,8 +190,8 @@ test_expect_success 'parallel' '
> test_must_fail env GIT_TRACE="$PWD/trace" \
> git fetch --jobs=2 --multiple one two 2>err &&
> grep "2 tasks" trace &&
> - grep "one.*128" err &&
> - grep "two.*128" err
> + test_i18ngrep "one.*128" err &&
> + test_i18ngrep "two.*128" err
> '
>
> test_done
> --
> 2.23.0-686-g3bf927a9c0
>
>
next prev parent reply other threads:[~2019-10-04 22:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 11:53 [PATCH 0/1] fetch --multiple: respect --jobs= Johannes Schindelin via GitGitGadget
2019-10-01 11:53 ` [PATCH 1/1] fetch: let --jobs=<n> parallelize --multiple, too Johannes Schindelin via GitGitGadget
2019-10-04 4:33 ` Junio C Hamano
2019-10-04 22:03 ` Johannes Schindelin [this message]
2019-10-05 18:46 ` [PATCH v2 0/1] fetch --multiple: respect --jobs= Johannes Schindelin via GitGitGadget
2019-10-05 18:46 ` [PATCH v2 1/1] fetch: let --jobs=<n> parallelize --multiple, too Johannes Schindelin via GitGitGadget
[not found] ` <xmqqftk67r6j.fsf@gitster-ct.c.googlers.com>
2019-10-06 9:53 ` Johannes Schindelin
2019-10-07 1:17 ` Junio C Hamano
2019-10-07 10:14 ` Johannes Schindelin
2019-10-07 10:17 ` 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.1910042356450.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).