On Mon, Mar 17, 2025 at 4:00 PM Taylor Blau <me@xxxxxxxxxxxx> wrote:
>
> Now that a number of new tests have landed in t7704, make sure that they
> all make sense and are testing the things they say they are.
>
> Things are mostly OK, but a handful of tests needed tweaks. Those tweaks
> are as follows:
>
> - Use the terms "too large" or "too small" in tests that exercise the
> '--max-cruft-size' behavior. This has historically been treated as a
> threshold beneath which to combine cruft packs, but that will change
> in a subsequent commit. Prepare for that by using a more generic
> term.
>
> - Remove references to "--max-cruft-size" in the freshening tests.
> These tests provide coverage of our ability to record updated mtimes
> for objects already in cruft packs whose mtimes are upserted from
> various sources (loose objects, finding that object in a new pack,
> another cruft pack, etc.).
>
> These have nothing to do with the '--max-cruft-size' feature, and in
> fact none of the tests even *use* '--max-cruft-size'. Name them
> appropriately to make it clear that these tests exercise freshening
> behavior, not '--max-cruft-size' behavior.
>
> Signed-off-by: Taylor Blau <me@xxxxxxxxxxxx>
> ---
> t/t7704-repack-cruft.sh | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/t/t7704-repack-cruft.sh b/t/t7704-repack-cruft.sh
> index cd452040ea..e6e4c2fad8 100755
> --- a/t/t7704-repack-cruft.sh
> +++ b/t/t7704-repack-cruft.sh
> @@ -149,7 +149,7 @@ generate_cruft_pack () {
> echo "$packdir/pack-$pack.mtimes"
> }
>
> -test_expect_success '--max-cruft-size creates new packs when above threshold' '
> +test_expect_success '--max-cruft-size creates new packs when too large' '
> git init max-cruft-size-large &&
> (
> cd max-cruft-size-large &&
> @@ -173,7 +173,7 @@ test_expect_success '--max-cruft-size creates new packs when above threshold' '
> )
> '
>
> -test_expect_success '--max-cruft-size combines existing packs when below threshold' '
> +test_expect_success '--max-cruft-size combines existing packs when not too large' '
> git init max-cruft-size-small &&
> (
> cd max-cruft-size-small &&
> @@ -236,10 +236,10 @@ test_expect_success '--max-cruft-size combines smaller packs first' '
> )
> '
>
> -test_expect_success 'setup --max-cruft-size with freshened objects' '
> - git init max-cruft-size-freshen &&
> +test_expect_success 'setup cruft with freshened objects' '
> + git init cruft-freshen &&
> (
> - cd max-cruft-size-freshen &&
> + cd cruft-freshen &&
>
> test_commit base &&
> git repack -ad &&
> @@ -257,9 +257,9 @@ test_expect_success 'setup --max-cruft-size with freshened objects' '
> )
> '
>
> -test_expect_success '--max-cruft-size with freshened objects (loose)' '
> +test_expect_success 'cruft with freshened objects (loose)' '
> (
> - cd max-cruft-size-freshen &&
> + cd cruft-freshen &&
>
> # regenerate the object, setting its mtime to be more recent
> foo="$(generate_random_blob foo 64)" &&
> @@ -275,9 +275,9 @@ test_expect_success '--max-cruft-size with freshened objects (loose)' '
> )
> '
>
> -test_expect_success '--max-cruft-size with freshened objects (packed)' '
> +test_expect_success 'cruft with freshened objects (packed)' '
> (
> - cd max-cruft-size-freshen &&
> + cd cruft-freshen &&
>
> # regenerate the object and store it in a packfile,
> # setting its mtime to be more recent
> @@ -304,7 +304,7 @@ test_expect_success '--max-cruft-size with freshened objects (packed)' '
> )
> '
>
> -test_expect_success '--max-cruft-size with freshened objects (previously cruft)' '
> +test_expect_success 'multi-cruft with freshened objects (previously cruft)' '
> repo="max-cruft-size-threshold" &&
>
> test_when_finished "rm -fr $repo" &&
> --
> 2.49.0.rc0.6.g7f120c35e9
Using --color-words for this diff makes it easy to see the small
wording clarifications; looks good.
