me/guix
Archived
1
0
Fork 0
Code Activity

tests: install: Fix device usage.

Browse source 
This is a follow-up of a860eddbbd. Guided
installation tests are now run from an ISO image. Hence the main block device
is vda and not vdb anymore.

* gnu/tests/install.scm (installation-target-os-for-gui-tests): Use
%minimal-os-on-vda instead of %minimal-os.
(%minimal-os-on-vda): Make sure that it replicates the config of %minimal-os.
This commit is contained in:
Mathieu Othacehe 2020-04-29 15:25:00 +02:00
parent e9f93cd5f7
commit c537d2bcb7
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/tests/install.scm
View file

@ -387,6 +387,7 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.")
(services (cons (service marionette-service-type (services (cons (service marionette-service-type
(marionette-configuration (marionette-configuration
(imported-modules '((gnu services herd) (imported-modules '((gnu services herd)
(guix build utils)
(guix combinators))))) (guix combinators)))))
%base-services)))) %base-services))))
@ -1058,7 +1059,7 @@ build (current-guix) and then store a couple of full system images.")
(define* (installation-target-os-for-gui-tests (define* (installation-target-os-for-gui-tests
#:key (encrypted? #f)) #:key (encrypted? #f))
(operating-system (operating-system
(inherit %minimal-os) (inherit %minimal-os-on-vda)
(users (append (list (user-account (users (append (list (user-account
(name "alice") (name "alice")
(comment "Bob's sister") (comment "Bob's sister")
@ -1076,7 +1077,7 @@ build (current-guix) and then store a couple of full system images.")
;; encryption support. ;; encryption support.
(swap-devices (if encrypted? '() '("/dev/vda2"))) (swap-devices (if encrypted? '() '("/dev/vda2")))
(services (cons (service dhcp-client-service-type) (services (cons (service dhcp-client-service-type)
(operating-system-user-services %minimal-os))))) (operating-system-user-services %minimal-os-on-vda)))))
(define* (installation-target-desktop-os-for-gui-tests (define* (installation-target-desktop-os-for-gui-tests
#:key (encrypted? #f)) #:key (encrypted? #f))