development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-29 21:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

t7900: fix flaky test due to leaking background job

Browse source 
One of the recently-added tests in t7900 exercises git-maintanance(1)
with the `--detach` flag, which causes it to perform maintenance in the
background. We do not wait for the backgrounded process to exit though,
which causes the process to leak outside of the test, leading to racy
behaviour.

Fix this by synchronizing with the process via a separate file
descriptor. This is the same workaround as we use in t6500, see the
function `run_and_wait_for_auto_gc ()`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2024-08-19 09:47:59 +02:00 committed by Junio C Hamano
parent 98077d06b2
commit 759b453f9f
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
t/t7900-maintenance.sh
View file

@ -967,8 +967,13 @@ test_expect_success '--detach causes maintenance to run in background' '
git config set maintenance.loose-objects.auto 1 &&
git config set maintenance.incremental-repack.enabled true &&
git maintenance run --detach >out 2>&1 &&
test_must_be_empty out
# The extra file descriptor gets inherited to the child
# process, and by reading stdout we thus essentially wait for
# that descriptor to get closed, which indicates that the child
# is done, too.
output=$(git maintenance run --detach 2>&1 9>&1) &&
printf "%s" "$output" >output &&
test_must_be_empty output
)
'