summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff_initial..side
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2026-08-12 12:11:47 +0200
committerJunio C Hamano <gitster@pobox.com>2026-08-12 08:40:29 -0700
commit2775d8bcd1be84e2376353a9713470567985b731 (patch)
tree23edecb30af8024b63c7ae46f424de7a196633f3 /t/t4013/diff.diff_initial..side
parent5fb9b8b4a685ee2767a2e8a63e11ba26b77a1125 (diff)
t7900: fix flaky "maintenance.strategy" test
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 git-maintenance(1) process. We usually disable auto-maintenance from detaching in our test suite to avoid exactly these kinds of race conditions by exporting `GIT_TEST_MAINT_AUTO_DETACH=false`. 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions