From patchwork Sat Oct 14 21:45:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13422147 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DB6E262BD for ; Sat, 14 Oct 2023 21:46:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="a7Z3DoQy"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="o3aA9LqN" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61088B7 for ; Sat, 14 Oct 2023 14:46:56 -0700 (PDT) Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id A634332009BA; Sat, 14 Oct 2023 17:46:55 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sat, 14 Oct 2023 17:46:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to; s=fm2; t=1697320015; x=1697406415; bh=y2Ku17LtD19XLKZbDXzVuE2sX fMsYhRiO8i2RRFQu9o=; b=a7Z3DoQy2RBxI4jRbgbhFVG3hc1gYYAkgnUGPoJHJ jlEOLTkME3VKLc2+KflruvbNP70YoqTrSYc0xwjtRb05DwNF+PHSHT7gwrh13ebc WsZXrSJ+b6NWEI8oleb60leYpovwHxbyny1gYKA0olfxBgPjKEWlFYlF1B37k2mg yq9KD1qdxeuXbE1NimXJAp9EZsl2jyfIW+d+uLPqL9yItoc9QTx+8INT9shj2HYz v/PE6vJtXMT4e8fWYQBvJMwgNHKq4Griy43HUJf6Rh8a+3rOmlhCl7r9I+mpbeL2 2VLpCQlFswuCVDxB7KZtTzSXyhjzOM38eWXhkeH6w+frQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1697320015; x=1697406415; bh=y2Ku17LtD19XLKZbDXzVuE2sXfMsYhRiO8i 2RRFQu9o=; b=o3aA9LqNPgJzrHcJpy7Bqf13KWBwNrwLUmU8pTcDRduMXg59GH3 F/wak5awzuMShHCqTpsCug7VTWDplvgLt+bjZAlqvASRJb/Xw/gVe56mluqbnkTB 85qtsT7QncJJdE5L0l17QKojt5ppPmRuBZrugBh5re8TYM0PESh1TcQw317V1vOq NoLvSL1PLIa0DVirhm4qA9T5C3HuCBo4vFVTTcv+qvn5+nEifH5EVRmEUPSPRhU4 +FKBx0Lye8u20I8P8JSHFZlJSY8ZByCepTyH4UG3OJaJxESglNuJW2VgSNt9/qkE lb7HVNWofoRa6AZPWDolqLZwLGHUbgzQswg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeiucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgenuceurghi lhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtre dtjeenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceotghouggv sehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeevgfelveeike egjeeikeeuvefhleeiuddvleegfeekjedtkeevtdetgfffveettdenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgeskhhhrghughhssg grkhhkrdhnrghmvg X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:46:54 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 1/8] t7900: remove register dependency Date: Sat, 14 Oct 2023 23:45:52 +0200 Message-ID: <6d9398e64d0acb69219877c54ba3fdfa0faa0dbf.1697319294.git.code@khaugsbakk.name> X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net `stop from existing schedule` depends on the preceding test `start from empty cron table` because the preceding test registers the repository. Without it, the “stop” test fails because `config` fails to get the repository: git config --get --global --fixed-value maintenance.repo "$(pwd)" Remove this dependency by setting up the state and tearing it down independently. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 487e326b3fa..ca86b2ba687 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -588,6 +588,7 @@ test_expect_success 'start --scheduler=' ' ' test_expect_success 'start from empty cron table' ' + test_when_finished git maintenance unregister && GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab && # start registers the repo @@ -599,6 +600,8 @@ test_expect_success 'start from empty cron table' ' ' test_expect_success 'stop from existing schedule' ' + test_when_finished git maintenance unregister && + git maintenance register && GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop && # stop does not unregister the repo From patchwork Sat Oct 14 21:45:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13422148 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 123D5266BA for ; Sat, 14 Oct 2023 21:46:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="eF5uIaP8"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="PQaKxPnB" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 770AED6 for ; Sat, 14 Oct 2023 14:46:58 -0700 (PDT) Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id BD68B320092F; Sat, 14 Oct 2023 17:46:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sat, 14 Oct 2023 17:46:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697320017; x= 1697406417; bh=SQBfZ0bVapzlo7/x3lOTQ84HKm5QH8ztq27+HGpsZdo=; b=e F5uIaP8HANpvFF7APpkvMJPVhRyO1vwbNMzvDe3ZbXySx6PBdEgEAhYHy/S4NI9U QOcGNTocxi242JmnnNHY0lsp1r63Ud1W2OOYrf67Ocz2/NkTyGRCDw94lRysShB/ E+CipMWxiM9BkS9MV6oT7DWicBR7OBzRu69LkJbnX2MbaOSktBIxXW4vMsmIpcec 7hpvk7tdEzPP6fMbwyao1kEV3TqHmkbE2ztuoLwPGk+VNFxH150adH1fYZu7tEPd iqSRGmevRHSkW0KOVFTa6vit4gWTLgt40n3el11hdE2SLRgyz+8WqWtD/3ym9/Ih 8iWsgdeLdw1AbDFDld4PA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697320017; x= 1697406417; bh=SQBfZ0bVapzlo7/x3lOTQ84HKm5QH8ztq27+HGpsZdo=; b=P QaKxPnBiKuBqK3+O1W6xM+A9k/RPj8WI7VHzlhN8wp366GFTbp8fzfn6MeOAozHD 3GHTd3sqXB8qV5hxTnxZopynRFd9tNMq5JwQBRFgD7zCXqBgIfbg67xssK84qWkI JTMFLdUTOTWNb+yeZYAX23+VNAgHdV9TgO5L+GyMuktRM9qyAz0xNvdFI8Wy3hqJ t1ZWMoT7PojISBbjq4bXyl8HqXiBkphB5TmetLcGGQRXMAnXGPsOysrV6teF0pKD DM6g0UgUYBemphsVYj24R0S0J6HjP9NNr52gac84TAioF2ATgSU3nU4bdksV0kgw 8/OgdSvW5D80gD5EyEdWg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeiucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgenuceurghi lhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertd dtnecuhfhrohhmpefmrhhishhtohhffhgvrhcujfgruhhgshgsrghkkhcuoegtohguvges khhhrghughhssggrkhhkrdhnrghmvgeqnecuggftrfgrthhtvghrnhepteduieehgedutd fgudevkefhveduieeiteejhfffteeitdegjeeihedthfejgfetnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghouggvsehkhhgruhhgshgsrg hkkhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:46:56 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 2/8] t7900: setup and tear down clones Date: Sat, 14 Oct 2023 23:45:53 +0200 Message-ID: X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Test `loose-objects task` depends on the two clones setup in `prefetch multiple remotes`. Reuse the two clones setup and tear down the clones afterwards in both tests. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index ca86b2ba687..ebc207f1a58 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -145,6 +145,12 @@ test_expect_success 'run --task=prefetch with no remotes' ' ' test_expect_success 'prefetch multiple remotes' ' + test_when_finished rm -r clone1 && + test_when_finished rm -r clone2 && + test_when_finished git remote remove remote1 && + test_when_finished git remote remove remote2 && + test_when_finished git tag --delete one && + test_when_finished git tag --delete two && git clone . clone1 && git clone . clone2 && git remote add remote1 "file://$(pwd)/clone1" && @@ -175,6 +181,22 @@ test_expect_success 'prefetch multiple remotes' ' ' test_expect_success 'loose-objects task' ' + test_when_finished rm -r clone1 && + test_when_finished rm -r clone2 && + test_when_finished git remote remove remote1 && + test_when_finished git remote remove remote2 && + test_when_finished git tag --delete one && + test_when_finished git tag --delete two && + git clone . clone1 && + git clone . clone2 && + git remote add remote1 "file://$(pwd)/clone1" && + git remote add remote2 "file://$(pwd)/clone2" && + git -C clone1 switch -c one && + git -C clone2 switch -c two && + test_commit -C clone1 one && + test_commit -C clone2 two && + git fetch --all && + # Repack everything so we know the state of the object dir git repack -adk && From patchwork Sat Oct 14 21:45:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13422149 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6BC826E00 for ; Sat, 14 Oct 2023 21:47:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="UB8GH20a"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="UiumWBTi" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70156D8 for ; Sat, 14 Oct 2023 14:47:00 -0700 (PDT) Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id B61F0320092F; Sat, 14 Oct 2023 17:46:59 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sat, 14 Oct 2023 17:47:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697320019; x= 1697406419; bh=QysTTnd6+x8dgUeA2sV8hCc09c37MPkT4fm0PaXbuL8=; b=U B8GH20aOGZcsutD+APjyPoPq2qtSCM4gf1P74gA42RkudjxPHCatmh2iHIqJ9ZTT UInUdvpFKq4VkLLDedwdIlQB/bEY2JuYcALaqT1NQZKp/VOi1MxKWSVeJ5VdYXrX doX4CG4TGDjZp8pq+SGGsSHjDI4ouoceoSw//PnSxSevl7b/gDw+p7HacsxHfIjp X5Z71RiA6Ev2QdzHebH4YpdCCoX2Ei1XrBw7SxMipOR0t/K5zdEE7fD7s9TcvABo dPES+XW1CDvN4U/kDzAqQypfFXmr3orDJhi5c8TNxwjkT69g94/LejEg/wtn5VxG x1LubZz7czVhvahiRNdNQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697320019; x= 1697406419; bh=QysTTnd6+x8dgUeA2sV8hCc09c37MPkT4fm0PaXbuL8=; b=U iumWBTipjDAEDC/LVTr+Ix4DltzCcXuEPpCo72D/Hg0xVYMwBWDLzgLcOZPPW55R RxHBtwCT6hUHAHIDX5UOAJaghljWfyXSI1OTpnQfWod3Q2dZi4LUN9dWFqO1lN32 1+mfE581dJ7+Q85e1U4U9AeFduGXT27mIeXH7cgce4SjRQ16flpr3jSBQW/B4Xbn 3aCyUiFQO1tvrmsqbDmFVemUsNAxqpFKwdPo4diUEjIXD+ucYKQjcJE+dubxt1kc MrUltF3sYO0AsdQZqRKk41ICYgRmoCNXcVzxRN1+RrbOWT+Q9jcG+7pT101MMIkk 7UO+h755AefMqSiLQP4SQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeiucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgenuceurghi lhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertd dtnecuhfhrohhmpefmrhhishhtohhffhgvrhcujfgruhhgshgsrghkkhcuoegtohguvges khhhrghughhssggrkhhkrdhnrghmvgeqnecuggftrfgrthhtvghrnhepvdelueduteduff ejjeeuudfgvddukeeiveeiudffieevudehtdefgefhvddvgfegnecuffhomhgrihhnpehi nhgtrhgvmhgvnhhtrghlqdhrvghprggtkhdrrghuthhonecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomheptghouggvsehkhhgruhhgshgsrghkkhdr nhgrmhgv X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:46:58 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 3/8] t7900: create commit so that branch is born Date: Sat, 14 Oct 2023 23:45:54 +0200 Message-ID: X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net `pack-refs task` cannot be run in isolation but does pass if `maintenance.auto config option` is run first. Create a commit so that `HEAD` does not point to an unborn branch. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index ebc207f1a58..4bfb4ec5cf6 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -388,6 +388,7 @@ test_expect_success 'maintenance.incremental-repack.auto (when config is unset)' ' test_expect_success 'pack-refs task' ' + test_commit message && for n in $(test_seq 1 5) do git branch -f to-pack/$n HEAD || return 1 From patchwork Sat Oct 14 21:45:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13422154 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D34B326E28 for ; Sat, 14 Oct 2023 21:47:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="cT03ihOS"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="HkbMExN+" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C04C5D6 for ; Sat, 14 Oct 2023 14:47:02 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 1198232009BB; Sat, 14 Oct 2023 17:47:01 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 14 Oct 2023 17:47:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697320021; x= 1697406421; bh=yFOZtHDAxL/J9lBur5x6bBmlfenz6cMPvtVn3MBMwQk=; b=c T03ihOSzJWPG3UQu2VqyQXEC+9+L4+aZoz/SjtiO5V4XUaD7PslKca3ylIFFddNK mpvEp/QFqk8Q6k4abZ2dZVpfOfedVEMWiE6IQyov+rNU3aGyZPpddYUPvmavoruY iCe4CGva3hILCoSmSvdGQpoMoIKgvl5nT3vbtBHiV+5bX3mPMTOW0LaOtRBn+fqW qDhtu1rX3mlNF6a8H2YIWkuT0Yf4VY09LoRl9VRlNYGRvItINPwc9V7Gs13tkw0G uE6Q+GnPDa/oQ7ePk8219RyyBZ9Q767MzUrfEy27C18P4idYdvdXBI4wx1B9LjNP nq6YL5lYKLZ37bpCi76RA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697320021; x= 1697406421; bh=yFOZtHDAxL/J9lBur5x6bBmlfenz6cMPvtVn3MBMwQk=; b=H kbMExN+ZRzfeitob7dGlKwOnMSUNwnQ4GzbHpd94WRUvHTlHYwT1pM1aZXbThw2y bGqjmBh+6yzALObQbcoJ+uv7MG7V/PhARJr+LOfIiZdxp2o2NllyO4rsEqpi05v/ KFtHBWb29Vmlfa8q4AaxlMYt8Vy/FWGoU58LkfTOcDZpKrrJFduB1GQoKg2qsa8s MeLUnOotN3KECKm6Ho7bfbmL8t5Qee7nTVndqyWPZBrGfwn0HCpR2QT7qow+eQUB VgpG2oZ9rl/0FwDZqpr3iPqbUgjoSlpr3jnVvwjboZUp+iWVmQG5tFQ7cCkvsG2q Dg8AA/iILyh6REBM1F0sA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeigddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceotgho uggvsehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetudeihe eguddtgfduveekhfevudeiieetjefhffetiedtgeejieehtdfhjefgteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgeskhhhrghugh hssggrkhhkrdhnrghmvg X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:47:00 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 4/8] t7900: factor out inheritance test dependency Date: Sat, 14 Oct 2023 23:45:55 +0200 Message-ID: X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Factor out the dependency that test `maintenance.strategy inheritance` has on test `--schedule inheritance weekly -> daily -> hourly`. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 4bfb4ec5cf6..6e3ee365ccd 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -408,14 +408,16 @@ test_expect_success 'invalid --schedule value' ' test_i18ngrep "unrecognized --schedule" err ' -test_expect_success '--schedule inheritance weekly -> daily -> hourly' ' +test_expect_success 'setup for inheritance' ' git config maintenance.loose-objects.enabled true && git config maintenance.loose-objects.schedule hourly && git config maintenance.commit-graph.enabled true && git config maintenance.commit-graph.schedule daily && git config maintenance.incremental-repack.enabled true && - git config maintenance.incremental-repack.schedule weekly && + git config maintenance.incremental-repack.schedule weekly +' +test_expect_success '--schedule inheritance weekly -> daily -> hourly' ' GIT_TRACE2_EVENT="$(pwd)/hourly.txt" \ git maintenance run --schedule=hourly 2>/dev/null && test_subcommand git prune-packed --quiet X-Patchwork-Id: 13422150 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04B8E273D1 for ; Sat, 14 Oct 2023 21:47:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="bytCkIlh"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="oTw+Qlgy" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00CC9DC for ; Sat, 14 Oct 2023 14:47:04 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 46F9C32006F5; Sat, 14 Oct 2023 17:47:04 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 14 Oct 2023 17:47:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697320023; x= 1697406423; bh=5AeWmCF/o3xO+F331J2rIs7myLA1Y3b2PqIJbRcOhfM=; b=b ytCkIlhujoGSMoQa4byet/vbfVCEraLUTIWhJ7BQCCQZLcU7qkBqMGd4lGL/laPM bSrMobYTsxrRoUPuKO1ruhvaGaWFg00T7psw9BRMHbLlv5/fDYFsfFTcv8rKfVlj mp/nwGybD7iqx2VcxKWWrpPAtHenrG0Kf2javHTN/YpC8Ns/1JTlMKEH0I0o8b6L D4LDbuThzE33atAkahzDpJlCH8XizT65B2RAyOIcizrO2T4sW9vFsTjnYkUWpABm Tw+6HFy4/ZSPdARLY33VdNVZdcUbmPt4jv7q94Vy7Y4INrUj/aozGBZ9t900JHcr gtcvBOihjCUJm46UIRgng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697320023; x= 1697406423; bh=5AeWmCF/o3xO+F331J2rIs7myLA1Y3b2PqIJbRcOhfM=; b=o Tw+QlgyFLXds/nUj38wHSCZPFL4GxvljZyY6IXAxp18c/4dx1exhcnQHy28IrIk6 tN6FK7l08ldRx87RBoKBeKO0h+IjxwUzWTFA5dU/bFZV0S9h0KzyfaTgSHykS+V/ h2sP/QrFm6esjkeLsz9W5e4RCju6Z8TnPjtZ4XA0hK4bfL6YBs16t5XKsk97gols vBPfb27U8e0CRyU0koWlU4PlLenQrdDfn91wV5MnFUL2+5m+5QuAkzQClW3Fm6px KT4dECyd1gVvfa38H+NBLn2BCzMvuNIhuATuxIcOOzLThQ+E4wx9CnUVTeLUExgG gyWHlt7rixzK6pl6kEYaA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeigddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceotgho uggvsehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetudeihe eguddtgfduveekhfevudeiieetjefhffetiedtgeejieehtdfhjefgteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgeskhhhrghugh hssggrkhhkrdhnrghmvg X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:47:02 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 5/8] t7900: factor out common schedule setup Date: Sat, 14 Oct 2023 23:45:56 +0200 Message-ID: X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Tests `magic markers are correct` and `stop preserves surrounding schedule` depend on some setup in `start preserves existing schedule`. Factor out the setup code. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 6e3ee365ccd..ebde3e8a212 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -637,9 +637,12 @@ test_expect_success 'stop from existing schedule' ' test_must_be_empty cron.txt ' -test_expect_success 'start preserves existing schedule' ' +test_expect_success 'setup important information for schedule' ' echo "Important information!" >cron.txt && - GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab && + GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab +' + +test_expect_success 'start preserves existing schedule' ' grep "Important information!" cron.txt ' From patchwork Sat Oct 14 21:45:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13422151 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 979B6273FA for ; Sat, 14 Oct 2023 21:47:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="XI+1OqT+"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="g13J38du" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23BABD6 for ; Sat, 14 Oct 2023 14:47:07 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 6C8CB320092F; Sat, 14 Oct 2023 17:47:06 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 14 Oct 2023 17:47:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697320025; x= 1697406425; bh=N+cHj9fbTU4/Zwh9ewntX5RxenxS3ohB6+mPzVEDkDg=; b=X I+1OqT+xZ3g5SPwYsmSh6Q+U05hfKNJz0HsxxcJp3B1FboJIo5PcXaOgw9yui0d/ scH7+vvqa6cEP7+GV2uXMpvqd1aCS8TQZ4QJVu9BLdQ+ijTLC6eEwtq/TNa4PM0Y 3OPJaDj5Lr27gODBQqcEcaPVL6mGkQq7KKJCQ1kwLU7kSSetmo02LWIXRoRWvmpJ ynGxmuh+Snoy+PvIdsNYxveJ2zkg40u3i8EQjVipgkWHsGbuIIEIfFcTvKXaivB1 YERGZxvhSM05jcZTUpGKCAf1YPTfGSrKZVqw3StCDEj8vnLLa2X4nwUAfi8kCOT9 SJTMkrQCxrt6PMwd0d5Fw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697320025; x= 1697406425; bh=N+cHj9fbTU4/Zwh9ewntX5RxenxS3ohB6+mPzVEDkDg=; b=g 13J38du2aggCRjKQO7bRKGEYK6KRr4zPXeEeLqDXjo12xHPINbpUQpUp9uwTrTfa XnLbt+kdiqVX9wkkh8x0aiWQ+ucj0Wd/KVGzxesoxp7JRUOvCoWw4BwxiqtvrUNW p8PeoIko2IDucnTxgLcomJn3zyCv2qML0Wm/R8mC0tuthGvnI1fYJwzEMm+64cCB h8M1nUDAct5cqZueoz5tix4Qq0Q8j5vmQ0hJs6auky1lMJs7X2PDNwV/gzC50bZf w9FUYKzJHTe28qFIv+EiPS7OiJ3o2xCG65/18r46oJUY4P54HiSN8mnYg1xux+hn x8JmDOn+7MlX8D34ZHHhQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeigddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceotgho uggvsehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetudeihe eguddtgfduveekhfevudeiieetjefhffetiedtgeejieehtdfhjefgteenucevlhhushht vghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgeskhhhrghugh hssggrkhhkrdhnrghmvg X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:47:04 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 6/8] t7900: fix `pfx` dependency Date: Sat, 14 Oct 2023 23:45:57 +0200 Message-ID: <5b70e635e2bdd8fc16ff6ff3c1eaecd10ba66634.1697319294.git.code@khaugsbakk.name> X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Test `start and stop when several schedulers are available` depends on `pfx` from `start and stop macOS maintenance`. Duplicate the behavior. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index ebde3e8a212..15a8653b583 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -794,6 +794,7 @@ test_expect_success 'start and stop Linux/systemd maintenance' ' ' test_expect_success 'start and stop when several schedulers are available' ' + pfx=$(cd "$HOME" && pwd) && write_script print-args <<-\EOF && printf "%s\n" "$*" | sed "s:gui/[0-9][0-9]*:gui/[UID]:; s:\(schtasks /create .* /xml\).*:\1:;" >>args EOF From patchwork Sat Oct 14 21:45:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13422152 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE075266A1 for ; Sat, 14 Oct 2023 21:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="nnn9qZWc"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Vs0mOe9Z" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B42BDF for ; Sat, 14 Oct 2023 14:47:09 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 78567320092F; Sat, 14 Oct 2023 17:47:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 14 Oct 2023 17:47:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697320028; x= 1697406428; bh=hDXQVwV95eOFaJC0511x+iJeioNlkhfNw1fCU5CxuAc=; b=n nn9qZWcDEDfYO8QkeZA7qdsTDVVbMuJWS80tDXUlvuruFfUZvsGYh2WjEiQ1wIS6 j9DBL5WqDbUysf2uOTX49pTw4Kks2nx5i+cwQIiNYo6BjczE5ClIsZd3g9XkuGjZ eqw3eg61ykxGEYr7l9bKINsr1FJxheFK0QOGqJpy6UdefaabB03+bnMhLUjPz4a9 rv7k3hDMwgGO9YIlCxVJIMyQzfJRpUdy/C2pIu/RAkACCvlNjApElBbXvTRRyCCX czZUayVT4YtxIpuN0bwJ+TGXeYxPwv8PwY7qpirN6thAIuP3yiASrhM0J3F6P+4n DZ25iNXeX/evmepnbtTIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697320028; x= 1697406428; bh=hDXQVwV95eOFaJC0511x+iJeioNlkhfNw1fCU5CxuAc=; b=V s0mOe9ZlN+seuuOIT9AFOj3ffTOmqMbj+sbMXHOnqDmAEcK3nryFNHteuEC7ohBT J7Q+RmX2okM+ADLeu38ZH12uruFB/BG7hbrndihTQQqOwebiYvC3LUyqL46IQMKU MzZfdlnVUyaKUWJ2r4phOIzzu8B/zk4rOxedTk4f1z95OpKEG4Ipz0PVlQjXJErg G/wVMNiu47/eyVr+CcVKyu+0Bq+CJ8+mtfUe9OmoW0fqJfY2kDY/2wFonrtcZCE4 fob7BI3Us95+aUUaHHemkB7M53H6bp/0/R6HTcrVO9QfPfhN6TnvGe7unQsAcbrE DYhzC4+wrrdUPMwOiYWnQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeigddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceotgho uggvsehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetudeihe eguddtgfduveekhfevudeiieetjefhffetiedtgeejieehtdfhjefgteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgeskhhhrghugh hssggrkhhkrdhnrghmvg X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:47:07 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 7/8] t7900: fix `print-args` dependency Date: Sat, 14 Oct 2023 23:45:58 +0200 Message-ID: X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Test `use launchctl list to prevent extra work` depends on `print-args` from `start and stop macOS maintenance`. Duplicate the script writing. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 15a8653b583..99279e41787 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -709,6 +709,9 @@ test_expect_success 'start and stop macOS maintenance' ' ' test_expect_success 'use launchctl list to prevent extra work' ' + write_script print-args <<-\EOF && + echo $* | sed "s:gui/[0-9][0-9]*:gui/[UID]:" >>args + EOF # ensure we are registered GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl && From patchwork Sat Oct 14 21:45:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Haugsbakk X-Patchwork-Id: 13422153 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D772427728 for ; Sat, 14 Oct 2023 21:47:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="V+r+w/bk"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="n3vaXGLQ" Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68FB5DC for ; Sat, 14 Oct 2023 14:47:11 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id B2C1332006F5; Sat, 14 Oct 2023 17:47:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 14 Oct 2023 17:47:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697320030; x= 1697406430; bh=GlI9+jnasEXKAi7Z8lO4DjwxOp+lxHMh/ecBbySfRxI=; b=V +r+w/bkK4TLRJYjmNMWcIrOZDU24wWly2Nf53xozI9aR5oTd7VwOlQ7KBne+Rc9B mmBk7W/LxG0ro6SC0dhM3O9rz3ago2j/+I9457UJKCbrE8kgeB0x/vqs0zQJIazm sfsw1R04upcs+oE4CgU9rtBAT7BmLoxUovTr5wNgNSSywjvtVP90P+7ptyX29/J0 pt5wu5Aay4DocDRxe8n2XJizf/fPKj9AL0SeD1ICXA/RdjD1WizRCX8v6iHgBgs2 BW6wZG2WaicVc7ewuDELWj6KTanAY1UG8H+fouN3E0y0X8miCTTaDzJtnVZwAp+Q maSCbmzdp1y2hoW6r9E+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697320030; x= 1697406430; bh=GlI9+jnasEXKAi7Z8lO4DjwxOp+lxHMh/ecBbySfRxI=; b=n 3vaXGLQQFl+VqyyaWXFmdqwlOitURM8kDekHA9M9ZBAUtRQ1drzn60mTn1fPR44u uW5w1RTfcV0tPBZlA00+FE/UnZjLqZrwji+QOFhUhaaXzGiDBuX6tpBNT9ELVJ9a xyxYURZ8Qy2eyviBAsGkB4/DBojLLuBv9te9SEltWhelXlGRPYbF8CsVSV11d+v1 FptVuHY97hLOFZXsVclZp0xCXRNGzPW+lHlOu3qxw7fsoYPls3GJtuv3WO3iFekx ReKdIvQ0VkRtaSUi3uTrDvFXiBfQyzrU967rQyyZi3O2gyOaM/RfMBuGcNwcOcmw w8EqZS02P5RtNZNU6GjQw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeigddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceotgho uggvsehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeekleffke ekvdevfeekvddtudehvdffgfeiffdtudeutdefteeltdeijeekhedtteenucffohhmrghi nheplhhoohhsvgdqohgsjhgvtghtshdrrghuthhonecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheptghouggvsehkhhgruhhgshgsrghkkhdrnhgr mhgv X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 17:47:09 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 8/8] t7900: factor out packfile dependency Date: Sat, 14 Oct 2023 23:45:59 +0200 Message-ID: X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Tests `'--schedule inheritance weekly -> daily -> hourly` and `maintenance.strategy inheritance` depend on the packfile made in `incremental-repack task`. Factor out the packfile creation. Signed-off-by: Kristoffer Haugsbakk --- t/t7900-maintenance.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 99279e41787..bc417b518b5 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -257,13 +257,15 @@ test_expect_success 'maintenance.loose-objects.auto' ' test_subcommand git prune-packed --quiet X-Patchwork-Id: 13422162 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 613031845 for ; Sat, 14 Oct 2023 23:01:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=khaugsbakk.name header.i=@khaugsbakk.name header.b="YSlMh9WO"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="M5nlGlR6" Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF5D1B7 for ; Sat, 14 Oct 2023 16:01:05 -0700 (PDT) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 47A863200927; Sat, 14 Oct 2023 19:01:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sat, 14 Oct 2023 19:01:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=khaugsbakk.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1697324462; x= 1697410862; bh=yXQYbJQVWjFGHSeLqxMc71kugvCqksjC7wd1Fww/3PY=; b=Y SlMh9WONQBOMdm7XiaXzEzWfFzAbI90VfYCqxWGYdIpHOiEmT2vCe4IQfn8BbnuG Vcs+/bEZRXClSl9U77RzNpFiWnTzvx2N9FSNJ6AA8wK8eId/8jXg4fICbsJlgDFC ByOF9D5BijRCG6oppsMESwpIwG8SljmBEfEDEX94cJb49UES8mHeYNhc0puOvGJn lg6keHA7tSJymkYqgifIslIN0a4/Dmm1NfvMd+6PqYJB85JarIanhWSkX23YeCzm rhIS+EFOf962sUckonzGfKOBccV2QZ2BxZ1YrSZRx9OwRvLtEuFY2XYr7gctinW7 kqRkzMUms+jwbAv7dRwyA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1697324462; x= 1697410862; bh=yXQYbJQVWjFGHSeLqxMc71kugvCqksjC7wd1Fww/3PY=; b=M 5nlGlR6SYLKSfH4NySQQ4Dvnb6GxKZu9Xnea6Gu9HHPxP9pxG2ju3GtyB8tcw5y9 AOL8gooK4A7Xo/tyjV4Xsw9gyXuj00oWS6VU7PWB80/8rWLY9Y8tXtyJPy9sx9GP azzzcZ7oXI/zI7ZT75NWCy7dDy7QY9LuavZS9kQDC7TEIOEKVcLa8G9x5O1/JOzJ CHfhyaOYwUWxq0CgdWluX2MtM/HuD/5sXrlYahqK2kNHBy3IuBBoGaGYDuAsChPT CEPrSAItVdcQjBz6P6QqgDIEO29VaNHR2YSrzOi/5QNKSY4k11wEBTxPUJUWpzHE 4LziK6Fuu2DbyNaRsE4Mg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrieeigdduhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepmfhrihhsthhofhhfvghrucfjrghughhssggrkhhkuceotgho uggvsehkhhgruhhgshgsrghkkhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetudeihe eguddtgfduveekhfevudeiieetjefhffetiedtgeejieehtdfhjefgteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgeskhhhrghugh hssggrkhhkrdhnrghmvg X-ME-Proxy: Feedback-ID: i2671468f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 14 Oct 2023 19:01:01 -0400 (EDT) From: Kristoffer Haugsbakk To: git@vger.kernel.org Cc: Kristoffer Haugsbakk , stolee@gmail.com Subject: [PATCH 9/8] t7900: fix register dependency Date: Sun, 15 Oct 2023 01:00:44 +0200 Message-ID: X-Mailer: git-send-email 2.42.0.2.g879ad04204 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net The test `maintenance.auto config option` will fail if any preceding test has run `git maintenance register` since that turns `maintenance.auto` off for that repository and later calls to `unregister` will not turn it back to the default `true` value. Start with a fresh repository in this test. Signed-off-by: Kristoffer Haugsbakk --- Notes (series): I found this after publishing the series. t/t7900-maintenance.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index bc417b518b..dbc5e1eb44 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -55,6 +55,8 @@ test_expect_success 'run [--auto|--quiet]' ' ' test_expect_success 'maintenance.auto config option' ' + rm -rf .git && + git init && GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 && test_subcommand git maintenance run --auto --quiet