me
/
guix
Archived
1
0
Fork 0
Code

tests: Use the client 'start-service' procedure. 

The previous code worked "by chance": 'start' from (shepherd service)
happened to be in scope because the marionette REPL is created by a mere
'primitive-fork', and 'start' happened to kinda work.

* gnu/tests/base.scm (run-basic-test): Use 'start-service' from (gnu
services herd), not 'start' from (shepherd service), which is not
supposed to work.
* gnu/tests/install.scm (run-install): Likewise.
master
Ludovic Courtès 2023-04-21 13:17:40 +02:00
parent 95731b4ef1
commit fb32e226ce
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/tests/base.scm
View File

@ -148,7 +148,7 @@ Otherwise assume that there is no password for root."
(marionette-eval (marionette-eval
`(begin `(begin
(use-modules (gnu services herd)) (use-modules (gnu services herd))
(start 'user-processes) (start-service 'user-processes)
((@@ (gnu services herd) eval-there) ((@@ (gnu services herd) eval-there)
'(let ((result (read (current-input-port)))) '(let ((result (read (current-input-port))))
(if (eof-object? result) (if (eof-object? result)

4
gnu/tests/install.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2019, 2021 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>
@ -316,7 +316,7 @@ such as for RAID systems."
;; Wait for tty1. ;; Wait for tty1.
(marionette-eval '(begin (marionette-eval '(begin
(use-modules (gnu services herd)) (use-modules (gnu services herd))
(start 'term-tty1)) (start-service 'term-tty1))
marionette) marionette)
(when #$(->bool script) (when #$(->bool script)