From patchwork Tue Apr 7 21:14:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 21155 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 19F1E27BBE4; Tue, 7 Apr 2020 22:15:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E0E0227BBE1 for ; Tue, 7 Apr 2020 22:15:10 +0100 (BST) Received: from localhost ([::1]:53468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLvYs-0004gD-EO for patchwork@mira.cbaines.net; Tue, 07 Apr 2020 17:15:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37489) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLvYl-0004fz-Vs for guix-patches@gnu.org; Tue, 07 Apr 2020 17:15:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLvYk-00077c-VR for guix-patches@gnu.org; Tue, 07 Apr 2020 17:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLvYk-00077S-Sg for guix-patches@gnu.org; Tue, 07 Apr 2020 17:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jLvYk-00051E-Lc for guix-patches@gnu.org; Tue, 07 Apr 2020 17:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40497] [PATCH] reconfigure: Don't call build-derivations for upgrade-services test Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Apr 2020 21:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40497 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40497@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158629408119242 (code B ref -1); Tue, 07 Apr 2020 21:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Apr 2020 21:14:41 +0000 Received: from localhost ([127.0.0.1]:51105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLvYO-00050I-Q3 for submit@debbugs.gnu.org; Tue, 07 Apr 2020 17:14:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:56965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLvYN-00050B-OF for submit@debbugs.gnu.org; Tue, 07 Apr 2020 17:14:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37379) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLvYM-0004d9-JP for guix-patches@gnu.org; Tue, 07 Apr 2020 17:14:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLvYL-0006tj-Hz for guix-patches@gnu.org; Tue, 07 Apr 2020 17:14:38 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jLvYL-0006tV-CU for guix-patches@gnu.org; Tue, 07 Apr 2020 17:14:37 -0400 Received: from localhost (unknown [46.237.163.68]) by mira.cbaines.net (Postfix) with ESMTPSA id 4825E27BBE1 for ; Tue, 7 Apr 2020 22:14:36 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 63d6f719 for ; Tue, 7 Apr 2020 21:14:33 +0000 (UTC) From: Christopher Baines Date: Tue, 7 Apr 2020 22:14:33 +0100 Message-Id: <20200407211433.1620-1-mail@cbaines.net> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This commit adjusts the upgrade-services system test to not build anything when computing the derivation for the system test. I came across this when looking at issues computing the system test derivations to store in the Guix Data Service. * gnu/tests/reconfigure.scm (run-upgrade-services-test): Remove the use of, and definition for ensure-service-file. --- gnu/tests/reconfigure.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm index 8b85920979..928a210a94 100644 --- a/gnu/tests/reconfigure.scm +++ b/gnu/tests/reconfigure.scm @@ -136,14 +136,6 @@ Shepherd (PID 1) by unloading obsolete services and loading new services." (stop #~(const #t)) (respawn? #f))) - ;; Return the Shepherd service file for SERVICE, after ensuring that it - ;; exists in the store. - (define (ensure-service-file service) - (let ((file (shepherd-service-file service))) - (mlet* %store-monad ((store-object (lower-object file)) - (_ (built-derivations (list store-object)))) - (return file)))) - (define (test enable-dummy disable-dummy) (with-imported-modules '((gnu build marionette)) #~(begin @@ -187,10 +179,12 @@ Shepherd (PID 1) by unloading obsolete services and loading new services." (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) - (mlet* %store-monad ((file (ensure-service-file dummy-service))) - (let ((enable (upgrade-services-program (list file) '(dummy) '() '())) + (gexp->derivation + "upgrade-services" + (let* ((file (shepherd-service-file dummy-service)) + (enable (upgrade-services-program (list file) '(dummy) '() '())) (disable (upgrade-services-program '() '() '(dummy) '()))) - (gexp->derivation "upgrade-services" (test enable disable))))) + (test enable disable)))) (define* (run-install-bootloader-test) "Run a test of an OS running INSTALL-BOOTLOADER-PROGRAM, which installs a