me
/
guix
Archived
1
0
Fork 0
Code

gnu: tests: Fix guix-data-service test. 

Since revision 32, guix-data-service starts immediately but returns an HTTP
error code until initialization is complete. Adjust the test accordingly, and
remove the increased startup time limit.

* gnu/services/guix.scm (guix-data-service): Use default #:pid-file-timeout.
* gnu/tests/guix.scm (guix-data-service): Retry the http-get test several
times to give the service time to initialize.

Signed-off-by: Christopher Baines <mail@cbaines.net>
master
Timotej Lazar 2022-07-15 07:56:06 +02:00 committed by Christopher Baines
parent 9238ba5874
commit 6a2a8ca1f5
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/services/guix.scm
View File

@ -652,8 +652,6 @@ ca-certificates.crt file in the system profile."
#:user #$user
#:group #$group
#:pid-file "/var/run/guix-data-service/pid"
;; Allow time for migrations to run
#:pid-file-timeout 120
#:environment-variables
`(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")

21
gnu/tests/guix.scm
View File

@ -222,14 +222,23 @@ host all all ::1/128 trust"))))))
((pid) (number? pid))))))
marionette))
;; The service starts immediately but replies with status 500 until
;; initialization is complete, so keep trying for a while.
(define (try-http-get attempts)
(let ((status
(let-values (((response text)
(http-get #$(simple-format
#f "http://localhost:~A/healthcheck"
forwarded-port))))
(response-code response))))
(if (or (= status 200) (<= attempts 1))
status
(begin (sleep 5)
(try-http-get (- attempts 1))))))
(test-equal "http-get"
200
(let-values
(((response text)
(http-get #$(simple-format
#f "http://localhost:~A/healthcheck" forwarded-port)
#:decode-body? #t)))
(response-code response)))
(try-http-get 12))
(test-end))))