Re: [PATCH 1/1] fetch: let --jobs=<n> parallelize --multiple, too
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 4, 2019, 04:33 UTC
- Message-ID
- <xmqqftk9870h.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <818936f1e0389820fdfa31f36c6f75e8a4bb1a07.1569930816.git.gitgitgadget@gmail.com>
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 7 quoted lines
> +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.
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.
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