{"thread":{"id":"56390","subject":"[PATCH] t7900: add '--scheduler=launchctl' parameter to fix test","startedAt":"2021-08-28T00:02:56Z","lastAt":"2021-08-31T15:59:18Z","messageCount":4,"participants":["Ramsay Jones","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"433988","messageId":"17313607-7ae8-c37a-7931-7712c7bfdb88@ramsayjones.plus.com","threadId":"56390","inReplyTo":null,"subject":"[PATCH] t7900: add '--scheduler=launchctl' parameter to fix test","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2021-08-27T23:59:53Z","receivedAt":"2021-08-28T00:02:56Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSigned-off-by: Ramsay Jones \n---\n\nHi Lénaïc,\n\nAs I said, I had a test failure from your previous series (Linux Mint)\nwhich was solved with this patch.\n\nATB,\nRamsay Jones\n\n t/t7900-maintenance.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh\nindex 8955aea9c8..36a4218745 100755\n--- a/t/t7900-maintenance.sh\n+++ b/t/t7900-maintenance.sh\n@@ -609,11 +609,11 @@ test_expect_success 'start and stop macOS maintenance' '\n \n test_expect_success 'use launchctl list to prevent extra work' '\n \t# ensure we are registered\n-\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&\n+\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&\n \n \t# do it again on a fresh args file\n \trm -f args &&\n-\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&\n+\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&\n \n \tls \"$HOME/Library/LaunchAgents\" >actual &&\n \tcat >expect <<-\\EOF &&\n-- \n2.33.0\n"},{"id":"434113","messageId":"xmqqtuj66hu5.fsf@gitster.g","threadId":"56390","inReplyTo":"17313607-7ae8-c37a-7931-7712c7bfdb88@ramsayjones.plus.com","subject":"Re: [PATCH] t7900: add '--scheduler=launchctl' parameter to fix test","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-08-30T16:02:58Z","receivedAt":"2021-08-30T16:03:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramsay Jones writes:\n\n> Signed-off-by: Ramsay Jones \n> ---\n>\n> Hi Lénaïc,\n>\n> As I said, I had a test failure from your previous series (Linux Mint)\n> which was solved with this patch.\n>\n> ATB,\n> Ramsay Jones\n>\n> t/t7900-maintenance.sh | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n\nThis test comes from outside Lénaïc's series. I guess I am seeing a\nbotched semantic merge conflict resolution of mine where the two\ntopics met.\n\nThe need for this fix made me a bit worried that the behaviour of\nresolve_scheduler(SCHEDULER_AUTO) forces us to always name the\nscheduler or risk a similar breakage, but in real life, nobody needs\nto \"force\" use of, say, launchctl on a platform where launchctl is\nnot available so it is OK.\n\n\n> diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh\n> index 8955aea9c8..36a4218745 100755\n> --- a/t/t7900-maintenance.sh\n> +++ b/t/t7900-maintenance.sh\n> @@ -609,11 +609,11 @@ test_expect_success 'start and stop macOS maintenance' '\n> \n> test_expect_success 'use launchctl list to prevent extra work' '\n> \t# ensure we are registered\n> -\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&\n> +\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&\n> \n> \t# do it again on a fresh args file\n> \trm -f args &&\n> -\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&\n> +\tGIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&\n> \n> \tls \"$HOME/Library/LaunchAgents\" >actual &&\n> \tcat >expect <<-\\EOF &&\n"},{"id":"434211","messageId":"863717af-8500-1779-b278-be7a785ab011@ramsayjones.plus.com","threadId":"56390","inReplyTo":"xmqqtuj66hu5.fsf@gitster.g","subject":"Re: [PATCH] t7900: add '--scheduler=launchctl' parameter to fix test","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2021-08-31T00:44:06Z","receivedAt":"2021-08-31T00:44:11Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\n\nOn 30/08/2021 17:02, Junio C Hamano wrote:\n> Ramsay Jones writes:\n> \n[snip]\n> \n> This test comes from outside Lénaïc's series. I guess I am seeing a\n> botched semantic merge conflict resolution of mine where the two\n> topics met.\n\nOops! :( My apologies to you both.\n\nMy build of 'seen' had two test failures (t5319.19 and this one), and\nI had to be somewhere else in about 30 mins ...\n\nI should know by now not to rush out a patch ... Sorry to have wasted\nyour time.\n\nATB,\nRamsay Jones\n\n"},{"id":"434294","messageId":"xmqq7dg1y59p.fsf@gitster.g","threadId":"56390","inReplyTo":"863717af-8500-1779-b278-be7a785ab011@ramsayjones.plus.com","subject":"Re: [PATCH] t7900: add '--scheduler=launchctl' parameter to fix test","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-08-31T15:59:14Z","receivedAt":"2021-08-31T15:59:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramsay Jones writes:\n\n> On 30/08/2021 17:02, Junio C Hamano wrote:\n>> Ramsay Jones writes:\n>> \n> [snip]\n>> \n>> This test comes from outside Lénaïc's series. I guess I am seeing a\n>> botched semantic merge conflict resolution of mine where the two\n>> topics met.\n>\n> Oops! :( My apologies to you both.\n>\n> My build of 'seen' had two test failures (t5319.19 and this one), and\n> I had to be somewhere else in about 30 mins ...\n>\n> I should know by now not to rush out a patch ... Sorry to have wasted\n> your time.\n\nNo, the input was very valuable to me. Neither topic has enough to\nsolve the issue because the new test got created in the topic that\ndoes not yet have the --scheduler option in the \"git maintenance\"\ncommand, and the other topic that added the option does not yet have\nthe test yet.\n\nUnless one topic is made to build on the other, it is a semantic\ncontext for me to resolve.\n\nHopefully what is near the tip of 'seen' now has the merge fix.\n\nTHanks.\n\n"}]}