cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get the test suite working again

Browse source
This commit is contained in:
Christopher Baines 2024-08-07 17:21:49 +01:00
parent 77962f7c2c
commit 885a4758d3
2 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -1199,6 +1199,8 @@ SELECT 1 FROM derivation_source_file_nars WHERE derivation_source_file_id = $1"
all-ids)))) all-ids))))
(prevent-inlining-for-tests derivation-file-names->derivation-ids)
(define guix-store-path (define guix-store-path
(let ((store-path #f)) (let ((store-path #f))
(lambda (store) (lambda (store)

54
tests/jobs-load-new-guix-revision.scm
View file

@ -2,6 +2,7 @@
#:use-module (srfi srfi-64) #:use-module (srfi srfi-64)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (squee) #:use-module (squee)
#:use-module (fibers)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix tests) #:use-module (guix tests)
@ -62,11 +63,7 @@
(mock (mock
((guix-data-service jobs load-new-guix-revision) ((guix-data-service jobs load-new-guix-revision)
extract-information-from extract-information-from
(lambda* (conn guix-revision-id commit (lambda _
guix-source store-path
#:key skip-system-tests?
extra-inferior-environment-variables
parallelism)
#t)) #t))
(mock (mock
@ -81,6 +78,12 @@
(lambda (channel commit) (lambda (channel commit)
'())) '()))
(mock
((guix-data-service jobs load-new-guix-revision)
derivation-file-names->derivation-ids
(lambda _
#(1)))
(mock (mock
((guix store) ((guix store)
add-temp-root add-temp-root
@ -97,7 +100,12 @@
"test-commit" "test-commit"
"test-source") "test-source")
((id) ((id)
(process-load-new-guix-revision-job id))))))))))))) (run-fibers
(lambda ()
(process-load-new-guix-revision-job
id #:parallelism 1))
#:hz 0
#:parallelism 1))))))))))))))
(exec-query conn "TRUNCATE guix_revisions CASCADE") (exec-query conn "TRUNCATE guix_revisions CASCADE")
(exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE") (exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")
@ -131,23 +139,17 @@
(mock (mock
((guix-data-service jobs load-new-guix-revision) ((guix-data-service jobs load-new-guix-revision)
setup-logging channel-derivations-by-system->guix-store-item
(lambda (conn thunk) (lambda (channel-derivations-by-system)
(thunk))) #f))
(mock (match (enqueue-load-new-guix-revision-job
((guix-data-service jobs load-new-guix-revision) conn
channel-derivations-by-system->guix-store-item (git-repository-url->git-repository-id conn "test-url")
(lambda (channel-derivations-by-system) "test-commit"
#f)) "test-source")
((id)
(match (enqueue-load-new-guix-revision-job (process-load-new-guix-revision-job id))))))))
conn
(git-repository-url->git-repository-id conn "test-url")
"test-commit"
"test-source")
((id)
(process-load-new-guix-revision-job id)))))))))
(exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE") (exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")
@ -178,12 +180,6 @@
channel-derivations-by-system) channel-derivations-by-system)
0)) 0))
(mock
((guix-data-service jobs load-new-guix-revision)
setup-logging
(lambda (conn thunk)
(thunk)))
(mock (mock
((guix-data-service jobs load-new-guix-revision) ((guix-data-service jobs load-new-guix-revision)
channel-derivations-by-system->guix-store-item channel-derivations-by-system->guix-store-item
@ -212,7 +208,7 @@
"test-commit" "test-commit"
"test-source") "test-source")
((id) ((id)
(process-load-new-guix-revision-job id))))))))))) (process-load-new-guix-revision-job id))))))))))
(exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE") (exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")