From e7cd328714be93ed6a931c9110b52adc7b439752 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 Dec 2024 22:41:29 +0100 Subject: tests: Adjust for new return value of ‘start-service’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Shepherd 1.0, the “running value” of processes is no longer a plain integer; instead, it is a (process …) sexp. This commit adjusts tests to this change in a way that works both for 1.0 and for previous versions. * gnu/tests/databases.scm (run-memcached-test) (run-mysql-test): Don’t expect PID to be a number. * gnu/tests/docker.scm (run-docker-test) (run-docker-system-test, run-oci-container-test): Likewise. * gnu/tests/guix.scm (run-guix-build-coordinator-test) (run-guix-data-service-test, run-nar-herder-test) (run-bffe-test): Likewise. * gnu/tests/ldap.scm (run-ldap-test): Likewise. * gnu/tests/monitoring.scm (run-prometheus-node-exporter-server-test): Likewise. * gnu/tests/virtualization.scm (run-libvirt-test) (run-qemu-guest-agent-test, run-childhurd-test): Likewise. * gnu/tests/web.scm (run-webserver-test, run-php-fpm-test) (run-hpcguix-web-server-test, run-patchwork-test) (run-agate-test): Likewise * gnu/tests/ssh.scm (run-ssh-test): Accept a number, an ‘inetd-service’ sexp, or a ‘process’ sexp. Change-Id: I8c7a37a981f0788780fbc33752a38e7f9a026437 --- gnu/tests/virtualization.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/tests/virtualization.scm') diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index ed8d6b1c85..a3c9c4014b 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -91,7 +91,7 @@ (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) ;; Give the libvirtd service time to start up. @@ -206,7 +206,7 @@ (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-equal "ping guest" @@ -322,7 +322,7 @@ output." (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-equal "childhurd SSH server replies" -- cgit v1.2.3