tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 03:51:53 +02:00
Code Activity

tests: Adjust for new return value of ‘start-service’.

Browse Source 
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
This commit is contained in:
Ludovic Courtès
2024-12-09 22:41:29 +01:00
parent 51ee3a7278
commit e7cd328714
8 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/tests/guix.scm
+5 -5
View File
@@ -90,7 +90,7 @@
(#f #f)
(('service response-parts ...)
(match (assq-ref response-parts 'running)
((pid) (number? pid))))))
((pid) pid)))))
marionette))
(test-equal "http-get"
@@ -212,7 +212,7 @@ host all all ::1/128 trust"))))))
(#f #f)
(('service response-parts ...)
(match (assq-ref response-parts 'running)
((pid) (number? pid))))))
((pid) pid)))))
marionette))
(test-assert "process jobs service running"
@@ -223,7 +223,7 @@ host all all ::1/128 trust"))))))
(#f #f)
(('service response-parts ...)
(match (assq-ref response-parts 'running)
((pid) (number? pid))))))
((pid) pid)))))
marionette))
;; The service starts immediately but replies with status 500 until
@@ -378,7 +378,7 @@ host all all ::1/128 trust"))))))
(#f #f)
(('service response-parts ...)
(match (assq-ref response-parts 'running)
((pid) (number? pid))))))
((pid) pid)))))
marionette))
(test-equal "http-get"
@@ -456,7 +456,7 @@ host all all ::1/128 trust"))))))
(#f #f)
(('service response-parts ...)
(match (assq-ref response-parts 'running)
((pid) (number? pid))))))
((pid) pid)))))
marionette))
(test-equal "http-get"