From ba874d1dac4b4284b98132ce727b29325202c798 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 25 Nov 2024 06:33:41 +0100 Subject: [PATCH] t7900: fix host-dependent behaviour when testing git-maintenance(1) We have recently added a new test to t7900 that exercises whether git-maintenance(1) fails as expected when the "schedule.lock" file exists. The test depends on whether or not the host has the required executables present to schedule maintenance tasks in the first place, like systemd or launchctl -- if not, the test fails with an unrelated error before even checking for the lock file. This fails for example in our CI systems, where macOS images do not have launchctl available. Fix this issue by creating a stub systemctl(1) binary and using the systemd scheduler. Reported-by: Jeff King Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- t/t7900-maintenance.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index ee803b35b4..fdf00f22d1 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -996,10 +996,15 @@ test_expect_success 'repacking loose objects is quiet' ' ' test_expect_success 'maintenance aborts with existing lock file' ' - test_when_finished "rm -rf repo" && + test_when_finished "rm -rf repo script" && + mkdir script && + write_script script/systemctl <<-\EOF && + true + EOF + git init repo && : >repo/.git/objects/schedule.lock && - test_must_fail git -C repo maintenance start 2>err && + test_must_fail env PATH="$PWD/script:$PATH" git -C repo maintenance start --scheduler=systemd 2>err && test_grep "Another scheduled git-maintenance(1) process seems to be running" err '