From a9d8ad6595b5501e3b257266370591759b5bd82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Jul 2024 12:26:51 +0200 Subject: [PATCH] tests: base: Compare all the service provisions, not just canonical names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/tests/base.scm (run-basic-test)["shepherd services"]: Use ‘append-map’ on live service provisions to match what ‘operating-system-shepherd-service-names’ does. Change-Id: Ie54082eed6c7b8d37d3428711e71c11e80940235 --- gnu/tests/base.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index acba1ebd25..715b9036f9 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Ludovic Courtès +;;; Copyright © 2016-2020, 2022, 2024 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Marius Bakke @@ -200,14 +200,17 @@ (define marionette (test-assert "shepherd services" (let ((services (marionette-eval '(begin - (use-modules (gnu services herd)) + (use-modules (gnu services herd) + (srfi srfi-1)) - (map (compose car live-service-provision) - (current-services))) + (append-map live-service-provision + (current-services))) marionette))) (lset= eq? (pk 'services services) - '(root #$@(operating-system-shepherd-service-names os))))) + '(root + shepherd + #$@(operating-system-shepherd-service-names os))))) (test-equal "libc honors /etc/localtime" -7200 ;CEST = GMT+2