Do some more mocking in the jobs-load-new-guix-revision tests

To help with getting them running on Guile 3.
This commit is contained in:
Christopher Baines 2020-02-27 21:20:24 +00:00
parent a95c5ca5c9
commit 1ad581b05a

View file

@ -46,35 +46,41 @@
(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 setup-logging
(lambda (store channel-derivations-by-system) (lambda (conn thunk)
"/gnu/store/test")) (thunk)))
(mock (mock
((guix-data-service jobs load-new-guix-revision) ((guix-data-service jobs load-new-guix-revision)
extract-information-from channel-derivations-by-system->guix-store-item
(lambda (conn store guix-revision-id commit store-path) (lambda (store channel-derivations-by-system)
#t)) "/gnu/store/test"))
(mock (mock
((guix-data-service model channel-instance) ((guix-data-service jobs load-new-guix-revision)
insert-channel-instances extract-information-from
(lambda (conn guix-revision-id derivations-by-system) (lambda (conn store guix-revision-id commit store-path)
#t)) #t))
(mock (mock
((guix channels) ((guix-data-service model channel-instance)
channel-news-for-commit insert-channel-instances
(lambda (channel commit) (lambda (conn guix-revision-id derivations-by-system)
'())) #t))
(match (enqueue-load-new-guix-revision-job (mock
conn ((guix channels)
(git-repository-url->git-repository-id conn "test-url") channel-news-for-commit
"test-commit" (lambda (channel commit)
"test-source") '()))
((id)
(process-load-new-guix-revision-job id)))))))))) (match (enqueue-load-new-guix-revision-job
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 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")
@ -98,17 +104,23 @@
(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 setup-logging
(lambda (store channel-derivations-by-system) (lambda (conn thunk)
#f)) (thunk)))
(match (enqueue-load-new-guix-revision-job (mock
conn ((guix-data-service jobs load-new-guix-revision)
(git-repository-url->git-repository-id conn "test-url") channel-derivations-by-system->guix-store-item
"test-commit" (lambda (store channel-derivations-by-system)
"test-source") #f))
((id)
(process-load-new-guix-revision-job id))))))) (match (enqueue-load-new-guix-revision-job
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")
@ -131,29 +143,35 @@
(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 setup-logging
(lambda (store channel-derivations-by-system) (lambda (conn thunk)
"/gnu/store/test")) (thunk)))
(mock (mock
((guix-data-service jobs load-new-guix-revision) ((guix-data-service jobs load-new-guix-revision)
extract-information-from channel-derivations-by-system->guix-store-item
(lambda (conn store git-repository-id commit store-path) (lambda (store channel-derivations-by-system)
#f)) "/gnu/store/test"))
(mock (mock
((guix channels) ((guix-data-service jobs load-new-guix-revision)
channel-news-for-commit extract-information-from
(lambda (channel commit) (lambda (conn store git-repository-id commit store-path)
'())) #f))
(match (enqueue-load-new-guix-revision-job (mock
conn ((guix channels)
(git-repository-url->git-repository-id conn "test-url") channel-news-for-commit
"test-commit" (lambda (channel commit)
"test-source") '()))
((id)
(process-load-new-guix-revision-job id))))))))) (match (enqueue-load-new-guix-revision-job
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")