| Message ID | 20220715055604.4803-1-timotej.lazar@araneo.si |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#56563,v2] gnu: tests: Fix guix-data-service test. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/comparison | success | View comparision |
| cbaines/git-branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
Timotej Lazar <timotej.lazar@araneo.si> writes: > 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. > --- > gnu/services/guix.scm | 2 -- > gnu/tests/guix.scm | 19 +++++++++++++------ > 2 files changed, 13 insertions(+), 8 deletions(-) > Thanks Timotej, I've pushed this as a15b769c2f81034884ef0ae7fa8c1cea8df45c56. I've also updated the data service so that it responds with a 503 for the healthcheck when starting up, rather than a 500, as that's a bit nicer. Chris
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 338e027245..dac1e5841a 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -652,8 +652,6 @@ (define (guix-data-service-shepherd-services config) #: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") diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm index a4c3e35e5d..02221f4364 100644 --- a/gnu/tests/guix.scm +++ b/gnu/tests/guix.scm @@ -222,14 +222,21 @@ (define marionette ((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 10) (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 10)) (test-end))))