git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>,
	Derrick Stolee <dstolee@microsoft.com>
Cc: "Lénaïc Huard" <lenaic@lhuard.fr>,
	"GIT Mailing-list" <git@vger.kernel.org>
Subject: Re: [PATCH] t7900: add '--scheduler=launchctl' parameter to fix test
Date: Mon, 30 Aug 2021 09:02:58 -0700	[thread overview]
Message-ID: <xmqqtuj66hu5.fsf@gitster.g> (raw)
In-Reply-To: <17313607-7ae8-c37a-7931-7712c7bfdb88@ramsayjones.plus.com> (Ramsay Jones's message of "Sat, 28 Aug 2021 00:59:53 +0100")

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Lénaïc,
>
> As I said, I had a test failure from your previous series (Linux Mint)
> which was solved with this patch.
>
> ATB,
> Ramsay Jones
>
>  t/t7900-maintenance.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

This test comes from outside Lénaïc's series.  I guess I am seeing a
botched semantic merge conflict resolution of mine where the two
topics met.

The need for this fix made me a bit worried that the behaviour of
resolve_scheduler(SCHEDULER_AUTO) forces us to always name the
scheduler or risk a similar breakage, but in real life, nobody needs
to "force" use of, say, launchctl on a platform where launchctl is
not available so it is OK.


> diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
> index 8955aea9c8..36a4218745 100755
> --- a/t/t7900-maintenance.sh
> +++ b/t/t7900-maintenance.sh
> @@ -609,11 +609,11 @@ test_expect_success 'start and stop macOS maintenance' '
>  
>  test_expect_success 'use launchctl list to prevent extra work' '
>  	# ensure we are registered
> -	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
> +	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
>  
>  	# do it again on a fresh args file
>  	rm -f args &&
> -	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
> +	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
>  
>  	ls "$HOME/Library/LaunchAgents" >actual &&
>  	cat >expect <<-\EOF &&

  reply	other threads:[~2021-08-30 16:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-27 23:59 [PATCH] t7900: add '--scheduler=launchctl' parameter to fix test Ramsay Jones
2021-08-30 16:02 ` Junio C Hamano [this message]
2021-08-31  0:44   ` Ramsay Jones
2021-08-31 15:59     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtuj66hu5.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=dstolee@microsoft.com \
    --cc=git@vger.kernel.org \
    --cc=lenaic@lhuard.fr \
    --cc=ramsay@ramsayjones.plus.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).