From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iD7YARpR7Wb0JAAAe85BDQ:P1 (envelope-from ) for ; Fri, 20 Sep 2024 10:40:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iD7YARpR7Wb0JAAAe85BDQ (envelope-from ) for ; Fri, 20 Sep 2024 12:40:26 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=tp1c1SQ5; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=QlNxPR8T; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726828825; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ovim1EBaCAE1MVZajqRxcRakZdmW0ZG41AR3OZD7f5g=; b=gSH3D+FAyMWIqk7tFc5JH++6TvGDjonmYjJgziL2llhaTXcMlM9O+CvIYUVooS6RzeyauR 8v9EVk/kfqj/iEJ9s+EFAmqjhCjy0k5zZh98ljMfH4+Jj8utSMf5M3lQBgjPWcS+9uQnt+ HtnYkoFseiekJkWY00aOh07bWgkB8O6wJem0reUed+yUZqa7/sRHo0+TiuWP78HXGZpf/a bIHBmRPW+POF0OBl+296H13i2DEvtsEIyvlUr65SqwXhaezs7YJgtP6XYOcbp07hNf47G2 bGTB868m7fgTp2AvZSRDWu/xksg68ocqt0aBusUZkq7PFOOVonWKkeT46mInpA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=tp1c1SQ5; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=QlNxPR8T; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726828825; a=rsa-sha256; cv=none; b=GBZ0ntKp3tug9kBkzDgr/hoY7ESpvqwsi5KGxte5hZx3xoZVMFy78MgBovq+qthEaKPRAN W381Ut5BQIetJa0rbxe48xy3n6InHtolUvk6hN/cKW4OtR4Ac1Y0BeWybYWmzu2Qkkfaiq fHrmrvaOhI1bu1+TIylr/QjDfmtt2zQmMwLulIoEFByFg/XaW1JxqsCfQXPlG/+sSzd+aC tVr2Pq7oxtxD1A8uslab6Aj+4PhUa3dGFvuuZCbemG9w0aUspFg+yhAChlEiD4xlqvog3s jZXBgeeEeNsNIyppjtYKy6NpxgYy4huYWIEKa5adCS+eviKNXjqLo4KJ4xD9YA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8A6FB68C2B for ; Fri, 20 Sep 2024 12:40:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srb3M-0004zr-CL; Fri, 20 Sep 2024 06:39:57 -0400 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 1srb3B-0004xe-VU for guix-patches@gnu.org; Fri, 20 Sep 2024 06:39:46 -0400 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 1srb3B-0006Tp-KU for guix-patches@gnu.org; Fri, 20 Sep 2024 06:39:45 -0400 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:Date:From:To:Subject; bh=ovim1EBaCAE1MVZajqRxcRakZdmW0ZG41AR3OZD7f5g=; b=tp1c1SQ5BoK/ndDLV2cxNB55Beo3KRO7S8KnYYj6z1R3CRGC3Vy13uCmT6SvUwGkJtx3FddWWd4mcunNsbRqiA2BSM4OiYJ1ZHpuFdi/IB9MPxuZZRJADruHsI0KTYvcvECvWSZc/HnpLLnUCLKruu2xUe5U2EbPs08JzYPXZ7igHwEwp3AhnPWRVxpxaDsyIIaALorGgztpLVsOpHcA3jIulRPEK0pv9b6KrsOvtnlaYMQP06ghZHZ/7UG4VwnxSEOsdiZU+juYjVrqrNs55UTrRUY9HEzpNkHVE4ya7wenEfW38PL7oGqfhYqxDt6w0/N4j3kvcUkcASePIWOqeg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srb3U-0001P9-7j for guix-patches@gnu.org; Fri, 20 Sep 2024 06:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73202] [PATCH v2 03/15] gnu: tests: reconfigure: Remove bootloader install test. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Sep 2024 10:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73202 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73202@debbugs.gnu.org Cc: Lilah Tascheter Received: via spool by 73202-submit@debbugs.gnu.org id=B73202.17268287685201 (code B ref 73202); Fri, 20 Sep 2024 10:40:04 +0000 Received: (at 73202) by debbugs.gnu.org; 20 Sep 2024 10:39:28 +0000 Received: from localhost ([127.0.0.1]:34149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srb2t-0001Lb-BA for submit@debbugs.gnu.org; Fri, 20 Sep 2024 06:39:28 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54361 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srb2p-0001KU-3Q for 73202@debbugs.gnu.org; Fri, 20 Sep 2024 06:39:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1726828734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ovim1EBaCAE1MVZajqRxcRakZdmW0ZG41AR3OZD7f5g=; b=QlNxPR8TbxnSrQFf7lM8HQ1wCZXxkESSMqmGDsUxx8su4UUniPgJU97+7AnFzmE8tfvREw mTH4gNgKtNENKgHt0cpnIWioZHsDvKCxMJ8xGxSsB76AtEufrTXCuIorXaXDVYBcfIJqkS HA15b9n+6tu4KPrdL7Si139BBFmun2DEFTHOG3oRpPc7Wd5pXHKmoMrVbUGTkGg6SZ5Ujb g45PK2k5zh6bGXk/nKXcgX92rrfQSDM8X0a/O6V0YDL8CJBzagTy9GUfzzu0Sk3ch7zm9Z bL2SlAgZmwc2O3D1a4xKIkjfU6bpym4tWCMCxkKHy8UhOjGHGStXKQrD0TY6FA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d7f4739a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 20 Sep 2024 10:38:54 +0000 (UTC) Date: Fri, 20 Sep 2024 12:37:48 +0200 Message-ID: <58bd6e83712e96acd4c2c29ed7ff8be3c75a9d5a.1726827025.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 8A6FB68C2B X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -6.51 X-Migadu-Spam-Score: -6.51 X-TUID: oCTZHFSfYnyL From: Lilah Tascheter * gnu/tests/reconfigure.scm (%test-install-bootloader): Delete variable. (run-install-bootloader-test): Delete procedure. Change-Id: I3654d160f7306bb45a78b82ea6b249ff4281f739 --- gnu/tests/reconfigure.scm | 86 +-------------------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm index bcc7645fa3..8aa5311171 100644 --- a/gnu/tests/reconfigure.scm +++ b/gnu/tests/reconfigure.scm @@ -30,8 +30,7 @@ (define-module (gnu tests reconfigure) #:use-module (guix scripts system reconfigure) #:use-module (guix store) #:export (%test-switch-to-system - %test-upgrade-services - %test-install-bootloader)) + %test-upgrade-services)) ;;; Commentary: ;;; @@ -178,83 +177,6 @@ (define* (run-upgrade-services-test) (disable (upgrade-services-program '() '() '(dummy) '()))) (test enable disable)))) -(define* (run-install-bootloader-test) - "Run a test of an OS running INSTALL-BOOTLOADER-PROGRAM, which installs a -bootloader's configuration file." - (define os - (marionette-operating-system - (simple-operating-system) - #:imported-modules '((gnu services herd) - (guix combinators)))) - - (define vm (virtual-machine - (operating-system os) - (volatile? #f))) - - (define (test script) - (with-imported-modules '((gnu build marionette)) - #~(begin - (use-modules (gnu build marionette) - (ice-9 regex) - (srfi srfi-1) - (srfi srfi-64)) - - (define marionette - (make-marionette (list #$vm))) - - ;; Return the system generation paths that have GRUB menu entries. - (define (generations-in-grub-cfg marionette) - (let ((grub-cfg (marionette-eval - '(begin - (use-modules (rnrs io ports)) - (call-with-input-file "/boot/grub/grub.cfg" - get-string-all)) - marionette))) - (map (lambda (parameter) - (second (string-split (match:substring parameter) #\=))) - (list-matches "system=[^ ]*" grub-cfg)))) - - (test-runner-current (system-test-runner #$output)) - (test-begin "install-bootloader") - - (test-assert "no prior menu entry for system generation" - (not (member #$os (generations-in-grub-cfg marionette)))) - - (test-assert "script successfully evaluated" - (marionette-eval - '(primitive-load #$script) - marionette)) - - (test-assert "menu entry created for system generation" - (member #$os (generations-in-grub-cfg marionette))) - - (test-end)))) - - (let* ((bootloader ((compose bootloader-configuration-bootloader - operating-system-bootloader) - os)) - ;; The typical use-case for 'install-bootloader-program' is to read - ;; the boot parameters for the existing menu entries on the system, - ;; parse them with 'boot-parameters->menu-entry', and pass the - ;; results to 'operating-system-bootcfg'. However, to obtain boot - ;; parameters, we would need to start the marionette, which we should - ;; ideally avoid doing outside of the 'test' G-Expression. Thus, we - ;; generate a bootloader configuration for the script as if there - ;; were no existing menu entries. In the grand scheme of things, this - ;; matters little -- these tests should not make assertions about the - ;; behavior of 'operating-system-bootcfg'. - (bootcfg (operating-system-bootcfg os '())) - (bootcfg-file (bootloader-configuration-file bootloader))) - (gexp->derivation - "install-bootloader" - ;; Due to the read-only nature of the virtual machines used in the system - ;; test suite, the bootloader installer script is omitted. 'grub-install' - ;; would attempt to write directly to the virtual disk if the - ;; installation script were run. - (test - (install-bootloader-program #f #f #f bootcfg bootcfg-file '(#f) "/"))))) - - (define %test-switch-to-system (system-test (name "switch-to-system") @@ -267,9 +189,3 @@ (define %test-upgrade-services (description "Upgrade the Shepherd by unloading obsolete services and loading new services.") (value (run-upgrade-services-test)))) - -(define %test-install-bootloader - (system-test - (name "install-bootloader") - (description "Install a bootloader and its configuration file.") - (value (run-install-bootloader-test)))) -- 2.45.2