[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#73202] [PATCH v3 03/14] gnu: tests: reconfigure: Remove bootloader
From: |
Herman Rimm |
Subject: |
[bug#73202] [PATCH v3 03/14] gnu: tests: reconfigure: Remove bootloader install test. |
Date: |
Thu, 26 Sep 2024 12:09:00 +0200 |
From: Lilah Tascheter <lilah@lunabee.space>
* 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
- [bug#73202] [PATCH v2 12/15] gnu: bootloader: Install any bootloader to ESP., (continued)
- [bug#73202] [PATCH v2 12/15] gnu: bootloader: Install any bootloader to ESP., Herman Rimm, 2024/09/20
- [bug#73202] [PATCH v2 05/15] guix: scripts: Rewrite reinstall-bootloader to use provenance data., Herman Rimm, 2024/09/20
- [bug#73202] [PATCH v2 07/15] guix: records: Add wrap-element procedure., Herman Rimm, 2024/09/20
- [bug#73202] [PATCH v2 15/15] teams: Add bootloading team., Herman Rimm, 2024/09/20
- [bug#73202] [PATCH v2 13/15] gnu: bootloader: Match records outside the module., Herman Rimm, 2024/09/20
- [bug#73202] [PATCH v2 14/15] gnu: system: boot: Add procedure., Herman Rimm, 2024/09/20
- [bug#73202] [PATCH v2 00/15] Preparation for bootloader rewrite., Herman Rimm, 2024/09/21
- [bug#73202] [PATCH v3 01/14] gnu: bootloader: Remove deprecated bootloader-configuration field., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 02/14] gnu: system: Remove useless boot parameters., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 03/14] gnu: tests: reconfigure: Remove bootloader install test.,
Herman Rimm <=
- [bug#73202] [PATCH v3 08/14] gnu: bootloader: Add bootloader-target record and infastructure., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 09/14] gnu: bootloader: Add bootloader-configurations->gexp., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 06/14] guix: utils: Add flatten and flat-map from haunt., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 07/14] guix: records: Add wrap-element procedure., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 11/14] gnu: build: bootloader: Add efi-bootnums procedure., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 13/14] gnu: bootloader: Match records outside the module., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 10/14] gnu: bootloader: Add device-subvol field to menu-entry record., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 05/14] guix: scripts: Rewrite reinstall-bootloader to use provenance data., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 04/14] guix: scripts: Remove unused code., Herman Rimm, 2024/09/26
- [bug#73202] [PATCH v3 14/14] teams: Add bootloading team., Herman Rimm, 2024/09/26