Skip to content

Commit 1b01b03

Browse files
ttaylorrgitster
authored andcommitted
t/t7704-repack-cruft.sh: clarify wording in --max-cruft-size tests
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 <[email protected]> Acked-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cee95f2 commit 1b01b03

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

t/t7704-repack-cruft.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ generate_cruft_pack () {
149149
echo "$packdir/pack-$pack.mtimes"
150150
}
151151

152-
test_expect_success '--max-cruft-size creates new packs when above threshold' '
152+
test_expect_success '--max-cruft-size creates new packs when too large' '
153153
git init max-cruft-size-large &&
154154
(
155155
cd max-cruft-size-large &&
@@ -173,7 +173,7 @@ test_expect_success '--max-cruft-size creates new packs when above threshold' '
173173
)
174174
'
175175

176-
test_expect_success '--max-cruft-size combines existing packs when below threshold' '
176+
test_expect_success '--max-cruft-size combines existing packs when not too large' '
177177
git init max-cruft-size-small &&
178178
(
179179
cd max-cruft-size-small &&
@@ -236,10 +236,10 @@ test_expect_success '--max-cruft-size combines smaller packs first' '
236236
)
237237
'
238238

239-
test_expect_success 'setup --max-cruft-size with freshened objects' '
240-
git init max-cruft-size-freshen &&
239+
test_expect_success 'setup cruft with freshened objects' '
240+
git init cruft-freshen &&
241241
(
242-
cd max-cruft-size-freshen &&
242+
cd cruft-freshen &&
243243
244244
test_commit base &&
245245
git repack -ad &&
@@ -257,9 +257,9 @@ test_expect_success 'setup --max-cruft-size with freshened objects' '
257257
)
258258
'
259259

260-
test_expect_success '--max-cruft-size with freshened objects (loose)' '
260+
test_expect_success 'cruft with freshened objects (loose)' '
261261
(
262-
cd max-cruft-size-freshen &&
262+
cd cruft-freshen &&
263263
264264
# regenerate the object, setting its mtime to be more recent
265265
foo="$(generate_random_blob foo 64)" &&
@@ -275,9 +275,9 @@ test_expect_success '--max-cruft-size with freshened objects (loose)' '
275275
)
276276
'
277277

278-
test_expect_success '--max-cruft-size with freshened objects (packed)' '
278+
test_expect_success 'cruft with freshened objects (packed)' '
279279
(
280-
cd max-cruft-size-freshen &&
280+
cd cruft-freshen &&
281281
282282
# regenerate the object and store it in a packfile,
283283
# setting its mtime to be more recent
@@ -304,7 +304,7 @@ test_expect_success '--max-cruft-size with freshened objects (packed)' '
304304
)
305305
'
306306

307-
test_expect_success '--max-cruft-size with freshened objects (previously cruft)' '
307+
test_expect_success 'multi-cruft with freshened objects (previously cruft)' '
308308
repo="max-cruft-size-threshold" &&
309309
310310
test_when_finished "rm -fr $repo" &&

0 commit comments

Comments
 (0)