git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/2] t7900: fix flaky "maintenance.strategy" test

From
Patrick Steinhardt <ps@pks.im>
Date
Aug 7, 2026, 10:59 UTC
Message-ID
<20260807-pks-t7900-fix-flaky-test-v1-2-08d0ea0fbbc5@pks.im>
In-Reply-To
<20260807-pks-t7900-fix-flaky-test-v1-0-08d0ea0fbbc5@pks.im>

One of our tests for whether "maintenance.strategy" is being respected in t7900 is flaky in our CI systems:

    + GIT_TRACE2_EVENT=/tmp/test-output/trash directory.t7900-maintenance/repo/trace2.txt git -c maintenance.strategy=incremental maintenance run --quiet
    + test_maintenance_tasks trace2.txt
    + cat
    + sed -ne s/.*"region_enter".*"category":"maintenance\([^"]*\)".*"label":"\([^"][^"]*\)".*/\2\1/p trace2.txt
    + test_cmp expect actual
    + test 2 -ne 2
    + eval /usr/bin/diff -u "$@"
    + /usr/bin/diff -u expect actual
    --- expect	2026-08-07 06:20:51.388322602 +0000
    +++ actual	2026-08-07 06:20:51.388322602 +0000
    @@ -1,2 +0,0 @@
    -gc foreground
    -gc

When running with the "incremental" strategy, we expect two git-gc(1) tasks to have been executed, but sometimes the test simply doesn't execute any of those tasks.

A first hunch may be that maybe the disk-state is sometimes different and thus we decide not to run maintenance. But git-maintenance(1) doesn't run with the "--auto" switch, so we should execute those tasks regardless of the on-disk state.

But there's a second condition that may cause us to not execute tasks, namely when the "maintenance.lock" file exists due to a concurrently running tasks. We usually disable auto-maintenance from detaching in our test suite to avoid exactly these kinds of race conditions, but in t7900 we unset "GIT_TEST_MAINT_AUTO_DETACH" and thus enable the auto-detach logic. The intent of this is to exercise git-maintenance(1) closer to how it would run in a real-world scenario, but it does cause us to race when the detached maintenance job that was triggered by `test_commit()` lives long enough.

We could trivially fix this race by disabling auto-maintenance for this specific test. But that doesn't fix this class of races in this test suite: while I haven't seen any of the other tests fail in the same way, a bunch of them have this race, as well.

Instead, let's retain "GIT_TEST_MAINT_AUTO_DETACH" and only unset it as required.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 t/t7900-maintenance.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 6735a9e082..5fbb16f0f0 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -7,9 +7,6 @@ test_description='git maintenance builtin'
 GIT_TEST_COMMIT_GRAPH=0
 GIT_TEST_MULTI_PACK_INDEX=0
 
-# Ensure that auto-maintenance detaches as usual.
-sane_unset GIT_TEST_MAINT_AUTO_DETACH
-
 test_lazy_prereq XMLLINT '
 	xmllint --version
 '
@@ -71,6 +68,7 @@ test_expect_success 'maintenance.auto config option' '
 	git init repo &&
 	(
 		cd repo &&
+		sane_unset GIT_TEST_MAINT_AUTO_DETACH &&
 
 		GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
 		test_subcommand git maintenance run --auto --quiet --detach <default &&
@@ -90,6 +88,7 @@ test_expect_success 'gc.auto config option' '
 	git init repo &&
 	(
 		cd repo &&
+		sane_unset GIT_TEST_MAINT_AUTO_DETACH &&
 
 		GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
 		test_subcommand git maintenance run --auto --quiet --detach <default &&
@@ -107,6 +106,7 @@ test_expect_success 'maintenance.auto overrides gc.auto' '
 	git init repo &&
 	(
 		cd repo &&
+		sane_unset GIT_TEST_MAINT_AUTO_DETACH &&
 
 		git config set maintenance.auto false &&
 		git config set gc.auto 1 &&
-- 
2.55.0.679.g6767b8d81c.dirty
Previous: Karthik NayakNext: Karthik Nayak
Message 7 of 13 in “t7900: fix flaky "maintenance.strategy" test”
  1. 0/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 7, 2026
  2. 1/2 t7900: adapt some tests to use a throwaway repositoryPatrick Steinhardt, Aug 7, 2026
  3. Karthik NayakAug 12, 2026
  4. Patrick SteinhardtAug 12, 2026
  5. Karthik NayakAug 13, 2026
  6. Karthik NayakAug 12, 2026
  7. 2/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 7, 2026
  8. Karthik NayakAug 12, 2026
  9. Patrick SteinhardtAug 12, 2026
  10. 0/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 12, 2026
  11. 1/2 t7900: adapt some tests to use a throwaway repositoryPatrick Steinhardt, Aug 12, 2026
  12. 2/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 12, 2026
  13. Karthik NayakAug 13, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.