me/guix
Archived
1
0
Fork 0
Code Activity

installer: tests: Expect but do not select other services by default.

Browse source 
* 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.
This commit is contained in:
Tobias Geerinckx-Rice 2021-07-03 17:13:14 +02:00
parent ae004cead8
commit 0dbd2c3b08
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 9 additions and 4 deletions
gnu
installer
tests.scm
tests
install.scm

11
gnu/installer/tests.scm
View file

@ -220,8 +220,9 @@ ROOT-PASSWORD, and USERS."
(string-contains service "NSS")))) (string-contains service "NSS"))))
(choose-network-management-tool? (choose-network-management-tool?
(lambda (service) (lambda (service)
(string-contains service "DHCP")))) (string-contains service "DHCP")))
"Converse over PORT to choose networking services." (choose-other-service? (const #f)))
"Converse over PORT to choose services."
(define desktop-environments '()) (define desktop-environments '())
(converse port (converse port
@ -240,7 +241,11 @@ ROOT-PASSWORD, and USERS."
(multiple-choices? #f) (multiple-choices? #f)
(items ,services)) (items ,services))
(null? desktop-environments) (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) (define (edit-configuration-file file)
"Edit FILE, an operating system configuration file generated by the "Edit FILE, an operating system configuration file generated by the

2
gnu/tests/install.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; 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 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>