diff options
| author | Ludovic Courtès <[email protected]> | 2024-12-09 22:41:29 +0100 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2024-12-09 23:15:44 +0100 |
| commit | e7cd328714be93ed6a931c9110b52adc7b439752 (patch) | |
| tree | e8a58013422bc21624816e9063c0a7333810e97a /gnu/tests/docker.scm | |
| parent | 51ee3a727877500ad426e2c37a990df15d1283f5 (diff) | |
tests: Adjust for new return value of ‘start-service’.
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
Diffstat (limited to 'gnu/tests/docker.scm')
| -rw-r--r-- | gnu/tests/docker.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 46c886580c..90c8d0f850 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -97,7 +97,7 @@ inside %DOCKER-OS." (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-assert "containerd PID file present" @@ -111,7 +111,7 @@ inside %DOCKER-OS." (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-eq "fetch version" @@ -257,7 +257,7 @@ inside %DOCKER-OS." (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-assert "containerd PID file present" @@ -271,7 +271,7 @@ inside %DOCKER-OS." (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-assert "load system image and run it" @@ -422,7 +422,7 @@ docker-image} inside Docker.") (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-assert "containerd PID file present" @@ -436,7 +436,7 @@ docker-image} inside Docker.") (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (sleep 10) ; let service start @@ -449,7 +449,7 @@ docker-image} inside Docker.") (#f #f) (('service response-parts ...) (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) + ((pid) pid))))) marionette)) (test-equal "passing host environment variables and volumes" |