From e666a92344740a2ea2ec31015228e0418041499d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 27 Feb 2020 16:22:51 +0100 Subject: 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. --- gnu/tests/install.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/tests') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 8480c95fd6..9ecc45cc04 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -50,7 +50,8 @@ %test-btrfs-root-os %test-jfs-root-os - %test-gui-installed-os)) + %test-gui-installed-os + %test-gui-installed-os-encrypted)) ;;; Commentary: ;;; @@ -1045,7 +1046,9 @@ build (current-guix) and then store a couple of full system images.") (supplementary-groups '("wheel" "audio" "video")))) %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) (operating-system-user-services %minimal-os))))) @@ -1071,9 +1074,8 @@ build (current-guix) and then store a couple of full system images.") (guided-installation-test "gui-installed-os" #:encrypted? #f)) -;; (define %test-gui-installed-os -;; ;; FIXME: Fails due to . -;; (guided-installation-test "gui-installed-os-encrypted" -;; #:encrypted? #t)) +(define %test-gui-installed-os-encrypted + (guided-installation-test "gui-installed-os-encrypted" + #:encrypted? #t)) ;;; install.scm ends here -- cgit 1.4.1