[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/11: tests: install: Add %test-gui-installed-os-encrypted.
From: |
guix-commits |
Subject: |
09/11: tests: install: Add %test-gui-installed-os-encrypted. |
Date: |
Thu, 5 Mar 2020 17:42:28 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit e666a92344740a2ea2ec31015228e0418041499d
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
- branch master updated (2c2b1ef -> bc8b2ff), guix-commits, 2020/03/05
- 02/11: installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'., guix-commits, 2020/03/05
- 06/11: installer: Honor /tmp/installer-system-init-options., guix-commits, 2020/03/05
- 04/11: installer: Bypass connectivity check when /tmp/installer-assume-online exists., guix-commits, 2020/03/05
- 01/11: tests: 'run-basic-test' can enter a root password., guix-commits, 2020/03/05
- 05/11: installer: Run commands without hopping through the shell., guix-commits, 2020/03/05
- 08/11: installer: Fix cow-store umount., guix-commits, 2020/03/05
- 09/11: tests: install: Add %test-gui-installed-os-encrypted.,
guix-commits <=
- 11/11: ci: Adjust 'channel-build-system' for when the source is a file name., guix-commits, 2020/03/05
- 07/11: tests: install: Add "gui-installed-os"., guix-commits, 2020/03/05
- 03/11: installer: Implement a dialog on /var/guix/installer-socket., guix-commits, 2020/03/05
- 10/11: hydra: Remove uses of _IOLBF., guix-commits, 2020/03/05