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

[guix-commits]

mothacehe pushed a commit to branch wip-installer-test
in repository guix.

commit 6e025acd7d2a2f05f7129b45ea48063b2e0e3a05
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Thu Feb 27 16:22:51 2020 +0100

    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(-)

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 8480c95..9ecc45c 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 <https://bugs.gnu.org/39712>.
-;;   (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