From fb32e226ce3d3cd9bf12989850b2dd719266d583 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Apr 2023 13:17:40 +0200 Subject: 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. --- gnu/tests/base.scm | 2 +- gnu/tests/install.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/tests') diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 97edbbc6ad..5584628514 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -148,7 +148,7 @@ Otherwise assume that there is no password for root." (marionette-eval `(begin (use-modules (gnu services herd)) - (start 'user-processes) + (start-service 'user-processes) ((@@ (gnu services herd) eval-there) '(let ((result (read (current-input-port)))) (if (eof-object? result) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 4e0e274e66..57e9df4421 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2022 Ludovic Courtès +;;; Copyright © 2016-2023 Ludovic Courtès ;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic @@ -316,7 +316,7 @@ such as for RAID systems." ;; Wait for tty1. (marionette-eval '(begin (use-modules (gnu services herd)) - (start 'term-tty1)) + (start-service 'term-tty1)) marionette) (when #$(->bool script) -- cgit v1.2.3