From: Patrick Steinhardt <ps@pks.im>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] pack-bitmap: gracefully handle missing BTMP chunks
Date: Tue, 16 Apr 2024 06:47:51 +0200 [thread overview]
Message-ID: <Zh4C9xhOC4BVslyX@tanuki> (raw)
In-Reply-To: <Zh2vZB/60QlLYjUZ@nand.local>
[-- Attachment #1: Type: text/plain, Size: 2860 bytes --]
On Mon, Apr 15, 2024 at 06:51:16PM -0400, Taylor Blau wrote:
> On Mon, Apr 15, 2024 at 08:41:25AM +0200, Patrick Steinhardt wrote:
[snip]
> > diff --git a/t/t5326-multi-pack-bitmaps.sh b/t/t5326-multi-pack-bitmaps.sh
> > index 70d1b58709..5d7d321840 100755
> > --- a/t/t5326-multi-pack-bitmaps.sh
> > +++ b/t/t5326-multi-pack-bitmaps.sh
> > @@ -513,4 +513,21 @@ test_expect_success 'corrupt MIDX with bitmap causes fallback' '
> > )
> > '
> >
> > +for allow_pack_reuse in single multi
> > +do
> > + test_expect_success "reading MIDX without BTMP chunk does not complain with $allow_pack_reuse pack reuse" '
> > + test_when_finished "rm -rf midx-without-btmp" &&
> > + git init midx-without-btmp &&
> > + (
> > + cd midx-without-btmp &&
> > + test_commit initial &&
> > +
> > + git repack -Adbl --write-bitmap-index --write-midx &&
>
> `-b` is redundant with `--write-bitmap-index`.
Oops, right.
> > + GIT_TEST_MIDX_READ_BTMP=false git -c pack.allowPackReuse=$allow_pack_reuse \
> > + pack-objects --all --use-bitmap-index --stdout </dev/null >/dev/null 2>err &&
>
> A small note here, but setting stdin to read from /dev/null is
> unnecessary with `--all.`
Is it really? Executing `git pack-objects --all --stdout` on my system
blocks until stdin is closed. It _seems_ to work in the tests alright,
but doesn't work outside of them. Which is puzzling on its own.
> > + test_must_be_empty err
> > + )
> > + '
> > +done
> > +
>
> This test looks like it's exercising the right thing, but I'm not sure
> why it was split into two separate tests. Perhaps to allow the two to
> fail separately?
Exactly. It makes it easier to see which of both tests fails in case
only one does.
> Either way, the repository initialization, test_commit, and repacking
> could probably be combined into a single step to avoid re-running them
> for different values of $allow_pack_reuse.
>
> I would probably have written:
>
> git init midx-without-btmp &&
> (
> cd midx-without-btmp &&
>
> test_commit base &&
> git repack -adb --write-midx &&
>
> for c in single multi
> do
> GIT_TEST_MIDX_READ_BTMP=false git -c pack.allowPackReuse=$c pack-objects \
> --all --use-bitmap-index --stdout >/dev/null 2>err &&
> test_must_be_empty err || return 1
> done
> )
>
> TBH, I would like to see this test cleaned up before merging this one
> down. But otherwise this patch is looking good.
So I'm a bit torn here. I think your proposed way to test things is
inferior regarding usability, even though it is superior regarding
performance. We could move the common setup into a separate test, but
that has the issue that tests cannot easily be run as self-contained
units.
Patrick
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2024-04-16 4:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 5:59 [PATCH] pack-bitmap: gracefully handle missing BTMP chunks Patrick Steinhardt
2024-04-10 15:02 ` Taylor Blau
2024-04-15 6:34 ` Patrick Steinhardt
2024-04-15 22:42 ` Taylor Blau
2024-04-15 6:41 ` [PATCH v2] " Patrick Steinhardt
2024-04-15 8:51 ` Patrick Steinhardt
2024-04-15 17:41 ` Junio C Hamano
2024-04-15 22:51 ` Taylor Blau
2024-04-15 23:46 ` Junio C Hamano
2024-04-15 22:51 ` Taylor Blau
2024-04-16 4:47 ` Patrick Steinhardt [this message]
2024-04-16 5:12 ` Jeff King
2024-04-16 5:14 ` Patrick Steinhardt
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=Zh4C9xhOC4BVslyX@tanuki \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.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).