summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-04-21 13:17:40 +0200
committerLudovic Courtès <ludo@gnu.org>2023-04-21 16:16:38 +0200
commitfb32e226ce3d3cd9bf12989850b2dd719266d583 (patch)
treecd82ad87da12d9e3869f6d4147fc06d2da910b9e
parent95731b4ef1991f5b85aa9ec9d4fb97c006bec65d (diff)
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.
-rw-r--r--gnu/tests/base.scm2
-rw-r--r--gnu/tests/install.scm4
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 97edbbc6ada..5584628514c 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -148,7 +148,7 @@ Otherwise assume that there is no password for root."
148 (marionette-eval 148 (marionette-eval
149 `(begin 149 `(begin
150 (use-modules (gnu services herd)) 150 (use-modules (gnu services herd))
151 (start 'user-processes) 151 (start-service 'user-processes)
152 ((@@ (gnu services herd) eval-there) 152 ((@@ (gnu services herd) eval-there)
153 '(let ((result (read (current-input-port)))) 153 '(let ((result (read (current-input-port))))
154 (if (eof-object? result) 154 (if (eof-object? result)
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 4e0e274e662..57e9df4421f 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2016-2023 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr> 3;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
4;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> 4;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
5;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> 5;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
@@ -316,7 +316,7 @@ such as for RAID systems."
316 ;; Wait for tty1. 316 ;; Wait for tty1.
317 (marionette-eval '(begin 317 (marionette-eval '(begin
318 (use-modules (gnu services herd)) 318 (use-modules (gnu services herd))
319 (start 'term-tty1)) 319 (start-service 'term-tty1))
320 marionette) 320 marionette)
321 321
322 (when #$(->bool script) 322 (when #$(->bool script)