tests: install: Add %test-gui-installed-os-encrypted.

* gnu/tests/install.scm (%test-gui-installed-os-encrypted): New variable,
(guided-installation-test): set a swap-device only if there is no encryption.
This commit is contained in:
Mathieu Othacehe 2020-02-27 16:22:51 +01:00 committed by Ludovic Courtès
parent 64704be417
commit e666a92344
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -50,7 +50,8 @@ (define-module (gnu tests install)
%test-btrfs-root-os %test-btrfs-root-os
%test-jfs-root-os %test-jfs-root-os
%test-gui-installed-os)) %test-gui-installed-os
%test-gui-installed-os-encrypted))
;;; Commentary: ;;; Commentary:
;;; ;;;
@ -1045,7 +1046,9 @@ (define os
(supplementary-groups (supplementary-groups
'("wheel" "audio" "video")))) '("wheel" "audio" "video"))))
%base-user-accounts)) %base-user-accounts))
(swap-devices '("/dev/vdb2")) ;; The installer does not create a swap device in guided mode with
;; encryption support.
(swap-devices (if encrypted? '() '("/dev/vdb2")))
(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)))))
@ -1071,9 +1074,8 @@ (define %test-gui-installed-os
(guided-installation-test "gui-installed-os" (guided-installation-test "gui-installed-os"
#:encrypted? #f)) #:encrypted? #f))
;; (define %test-gui-installed-os (define %test-gui-installed-os-encrypted
;; ;; FIXME: Fails due to <https://bugs.gnu.org/39712>. (guided-installation-test "gui-installed-os-encrypted"
;; (guided-installation-test "gui-installed-os-encrypted" #:encrypted? #t))
;; #:encrypted? #t))
;;; install.scm ends here ;;; install.scm ends here