summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-07-03 17:13:14 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-07-04 13:04:45 +0200
commit0dbd2c3b089d50bdfbed86916d06cc4f0da8893d (patch)
tree280fef8ba5e0306df2c44827ac912673fe762cf0
parentae004cead8912d1ff963f0914c5583537be875bd (diff)
installer: tests: Expect but do not select other services by default.
* gnu/installer/tests.scm (choose-services): Accept a new choose-other-service? keyword argument, defaulting to false. Expect an "Other services" checkbox-list. Update docstring.
-rw-r--r--gnu/installer/tests.scm11
-rw-r--r--gnu/tests/install.scm2
2 files changed, 9 insertions, 4 deletions
diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm
index 8ccd327a7c..12d1d91608 100644
--- a/gnu/installer/tests.scm
+++ b/gnu/installer/tests.scm
@@ -220,8 +220,9 @@ ROOT-PASSWORD, and USERS."
(string-contains service "NSS"))))
(choose-network-management-tool?
(lambda (service)
- (string-contains service "DHCP"))))
- "Converse over PORT to choose networking services."
+ (string-contains service "DHCP")))
+ (choose-other-service? (const #f)))
+ "Converse over PORT to choose services."
(define desktop-environments '())
(converse port
@@ -240,7 +241,11 @@ ROOT-PASSWORD, and USERS."
(multiple-choices? #f)
(items ,services))
(null? desktop-environments)
- (find choose-network-management-tool? services))))
+ (find choose-network-management-tool? services))
+
+ ((checkbox-list (title "Other services") (text _)
+ (items ,services))
+ (filter choose-other-service? services))))
(define (edit-configuration-file file)
"Edit FILE, an operating system configuration file generated by the
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index b5263f5f0d..80604361e0 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>