diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-04-29 15:25:00 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-04-29 15:30:14 +0200 |
| commit | c537d2bcb7c652b4776435cd1e2a5119af43dd78 (patch) | |
| tree | 62cae1c16956d0b3387592a581a7ce9e8f1bc002 /gnu/tests | |
| parent | e9f93cd5f78ffa234263e049e594fc57cd1e94f7 (diff) | |
| download | guix-c537d2bcb7c652b4776435cd1e2a5119af43dd78.tar.gz guix-c537d2bcb7c652b4776435cd1e2a5119af43dd78.zip | |
tests: install: Fix device usage.
This is a follow-up of a860eddbbddeae5d3b6fe084e29ac9fafd2d6f02. 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.
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/install.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 8650474fbc..019e21fd39 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -387,6 +387,7 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.") (services (cons (service marionette-service-type (marionette-configuration (imported-modules '((gnu services herd) + (guix build utils) (guix combinators))))) %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 #:key (encrypted? #f)) (operating-system - (inherit %minimal-os) + (inherit %minimal-os-on-vda) (users (append (list (user-account (name "alice") (comment "Bob's sister") @@ -1076,7 +1077,7 @@ build (current-guix) and then store a couple of full system images.") ;; encryption support. (swap-devices (if encrypted? '() '("/dev/vda2"))) (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 #:key (encrypted? #f)) |