aboutsummaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2020-02-27 16:22:51 +0100
committerLudovic Courtès <ludo@gnu.org>2020-03-05 23:40:24 +0100
commite666a92344740a2ea2ec31015228e0418041499d (patch)
tree6c97021dcbcd206222428309dba5d115b99d8978 /gnu/tests
parent64704be417ab6f2788e8e3bc36fede1db35470e7 (diff)
downloadguix-e666a92344740a2ea2ec31015228e0418041499d.tar
guix-e666a92344740a2ea2ec31015228e0418041499d.tar.gz
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.
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/install.scm14
1 files changed, 8 insertions, 6 deletions
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 <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