From patchwork Mon Feb 17 14:35:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Arnold X-Patchwork-Id: 38782 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2C34627BBEA; Mon, 17 Feb 2025 14:36:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B742C27BBE2 for ; Mon, 17 Feb 2025 14:36:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tk2EI-0007VD-1a; Mon, 17 Feb 2025 09:36:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tk2E8-0007U0-N5 for guix-patches@gnu.org; Mon, 17 Feb 2025 09:36:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tk2E8-00038D-Dz for guix-patches@gnu.org; Mon, 17 Feb 2025 09:36:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=4T040SQSODzmvJUcGOrQHSVZMddJjKsnxbNRVcuS7PU=; b=XgXdBEY+mEvzgO/OBkPCuMPlOJiK8cUsfkCQgVz1pO9mvquhv2tg4w8GO3q2fK5dR1MzmKqVKfLd93qaHuwF1+0wUGDMuuqpe+nIYo2sScBQGmgNqXwGBKSMKjTX3f5TGv/eg+Bw3kADHSK1CSTxxrriIOi9rCa2yuon/2yaFeweC9+/n7MJbO1M8cEVqGk0TGMy+ZSrfmNn63WQjHjsL+K2kYqmqsS9rC7XTbW7LoUIVO+rxOK0fa0n08BZ5owenzaYnqCvVb84B9Cf3FCUfnt1P7B/CcQ50n+5L83Ty6e8EXmx0z+t4zq7JStGlyHQkj2HthWM8+9wid/oVNQewQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tk2E8-0001b5-84 for guix-patches@gnu.org; Mon, 17 Feb 2025 09:36:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#55231] [PATCH v7 3/4] tests: Remove extraneous 'with-store' in derivations test. Resent-From: Morgan Arnold Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Feb 2025 14:36:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55231@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55231-submit@debbugs.gnu.org id=B55231.17398029245964 (code B ref 55231); Mon, 17 Feb 2025 14:36:04 +0000 Received: (at 55231) by debbugs.gnu.org; 17 Feb 2025 14:35:24 +0000 Received: from localhost ([127.0.0.1]:45009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tk2DT-0001Y8-Gf for submit@debbugs.gnu.org; Mon, 17 Feb 2025 09:35:23 -0500 Received: from mail-10630.protonmail.ch ([79.135.106.30]:12697) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tk2DN-0001Wh-52 for 55231@debbugs.gnu.org; Mon, 17 Feb 2025 09:35:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1739802910; x=1740062110; bh=4T040SQSODzmvJUcGOrQHSVZMddJjKsnxbNRVcuS7PU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=X6dTDp333QRS3u9HoOPRkA1fbjIl9BvOSIPHGmWPVJixyWPlEgMRdg66IeMNBz3O4 Yw1f8p1oDmkeGDjoEgSnCmG3cN3VCek7KUqqn8MIfCAJ1I1bw5s37I/aHKrhJ4ZDWq 61bP5uavYGtc6HhSxxYh6w6WcVYaPuvc6u/yrlAFceWuOgmvxknxiqbJ9I3As4Ph1W PUMRkehMLcK/ZvhRmWHIGGoM9m/egO3kMNIXD7bsVCpNviAaQ46Lc8fUlkXaD2rOAP kbRImKJXvzibtDKuBfzAw5K039UOTtVmtcnAu6YMaf5cvT3v+E0YbOjw9r1Hfc8jtY XbYHmc6byQsTw== Date: Mon, 17 Feb 2025 14:35:07 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 45510636:user:proton X-Pm-Message-ID: b5b9b86a54fb6cb7c93ffe0285aade37f3079826 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Morgan Arnold X-ACL-Warn: , Morgan Arnold via Guix-patches X-Patchwork-Original-From: Morgan Arnold via Guix-patches via From: Morgan Arnold Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Maxim Cournoyer * tests/derivations.scm ("derivation fails but keep going"): Remove extraneous 'with-store'. Change-Id: If30c2d457504b8524cd167f1a145fbbea61b513c --- tests/derivations.scm | 45 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/tests/derivations.scm b/tests/derivations.scm index efcd21f..72ea9aa 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -150,29 +150,28 @@ (define* (directory-contents dir #:optional (slurp get-bytevector-all)) (test-assert "derivation fails but keep going" ;; In keep-going mode, 'build-derivations' should fail because of D1, but it ;; must return only after D2 has succeeded. - (with-store store - (let* ((d1 (derivation %store "fails" - %bash `("-c" "false") - #:sources (list %bash))) - (d2 (build-expression->derivation %store "sleep-then-succeed" - `(begin - ,(random-text) - ;; XXX: Hopefully that's long - ;; enough that D1 has already - ;; failed. - (sleep 2) - (mkdir %output))))) - (set-build-options %store - #:use-substitutes? #f - #:keep-going? #t) - (guard (c ((store-protocol-error? c) - (and (= 100 (store-protocol-error-status c)) - (string-contains (store-protocol-error-message c) - (derivation-file-name d1)) - (not (valid-path? %store (derivation->output-path d1))) - (valid-path? %store (derivation->output-path d2))))) - (build-derivations %store (list d1 d2)) - #f)))) + (let* ((d1 (derivation %store "fails" + %bash `("-c" "false") + #:sources (list %bash))) + (d2 (build-expression->derivation %store "sleep-then-succeed" + `(begin + ,(random-text) + ;; XXX: Hopefully that's long + ;; enough that D1 has already + ;; failed. + (sleep 2) + (mkdir %output))))) + (set-build-options %store + #:use-substitutes? #f + #:keep-going? #t) + (guard (c ((store-protocol-error? c) + (and (= 100 (store-protocol-error-status c)) + (string-contains (store-protocol-error-message c) + (derivation-file-name d1)) + (not (valid-path? %store (derivation->output-path d1))) + (valid-path? %store (derivation->output-path d2))))) + (build-derivations %store (list d1 d2)) + #f))) (test-assert "identical files are deduplicated" ;; Note: DATA must be longer than %DEDUPLICATION-MINIMUM-SIZE.