Skip to content

Commit d2fbe9a

Browse files
pks-tgitster
authored andcommitted
t7900: prepare for switch of the default strategy
The t7900 test suite is exercising git-maintenance(1) and is thus of course heavily reliant on the exact maintenance strategy. This reliance comes in two flavors: - One test explicitly wants to verify that git-gc(1) is run as part of `git maintenance run`. This test is adapted by explicitly picking the "gc" strategy. - The other tests assume a specific shape of the object database, which is dependent on whether or not we run auto-maintenance before we come to the actual subject under test. These tests are adapted by disabling auto-maintenance. With these changes t7900 passes with both "gc" and "geometric" default strategies. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 38ae87c commit d2fbe9a

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

t/t7900-maintenance.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ test_expect_success 'help text' '
4545
test_grep "usage: git maintenance" err
4646
'
4747

48-
test_expect_success 'run [--auto|--quiet]' '
48+
test_expect_success 'run [--auto|--quiet] with gc strategy' '
49+
test_config maintenance.strategy gc &&
4950
GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" \
5051
git maintenance run 2>/dev/null &&
5152
GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" \
@@ -499,6 +500,7 @@ test_expect_success 'maintenance.incremental-repack.auto' '
499500
(
500501
cd incremental-repack-true &&
501502
git config core.multiPackIndex true &&
503+
git config maintenance.auto false &&
502504
run_incremental_repack_and_verify
503505
)
504506
'
@@ -509,6 +511,7 @@ test_expect_success 'maintenance.incremental-repack.auto (when config is unset)'
509511
(
510512
cd incremental-repack-unset &&
511513
test_unconfig core.multiPackIndex &&
514+
git config maintenance.auto false &&
512515
run_incremental_repack_and_verify
513516
)
514517
'
@@ -619,6 +622,7 @@ test_expect_success 'geometric repacking with --auto' '
619622
git init repo &&
620623
(
621624
cd repo &&
625+
git config set maintenance.auto false &&
622626
623627
# An empty repository does not need repacking, except when
624628
# explicitly told to do it.

0 commit comments

Comments
 (0)