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