[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Address a few issues in the load new guix revision tests
|
From: |
Christopher Baines |
|
Subject: |
02/02: Address a few issues in the load new guix revision tests |
|
Date: |
Wed, 2 Mar 2022 13:24:25 -0500 (EST) |
cbaines pushed a commit to branch master
in repository data-service.
commit 3a9079856742b4d97bc434837323ff02eb9d32c3
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Mar 2 18:23:26 2022 +0000
Address a few issues in the load new guix revision tests
---
guix-data-service/jobs/load-new-guix-revision.scm | 2 +
tests/jobs-load-new-guix-revision.scm | 106 ++++++++++++----------
2 files changed, 62 insertions(+), 46 deletions(-)
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm
b/guix-data-service/jobs/load-new-guix-revision.scm
index 9456562..6f16817 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1402,6 +1402,8 @@ WHERE job_id = $1")
guix-revision-id))))))
+(prevent-inlining-for-tests load-channel-instances)
+
(define (load-new-guix-revision conn store git-repository-id commit)
(let* ((git-repository-fields
(select-git-repository conn git-repository-id))
diff --git a/tests/jobs-load-new-guix-revision.scm
b/tests/jobs-load-new-guix-revision.scm
index 7d722af..b70d702 100644
--- a/tests/jobs-load-new-guix-revision.scm
+++ b/tests/jobs-load-new-guix-revision.scm
@@ -39,10 +39,10 @@
((guix-data-service jobs load-new-guix-revision)
channel->derivations-by-system
(lambda (conn store channel fetch-with-authentication?)
- '((x86_64-linux
+ '(("x86_64-linux"
.
- ((manifest-entry-item . /gnu/store/foo.drv)
- (profile . /gnu/store/bar.drv))))))
+ ((manifest-entry-item . "/gnu/store/foo.drv")
+ (profile . "/gnu/store/bar.drv"))))))
(mock
((guix-data-service jobs load-new-guix-revision)
@@ -97,30 +97,37 @@
((guix-data-service jobs load-new-guix-revision)
channel->derivations-by-system
(lambda (conn store channel fetch-with-authentication?)
- '(x86_64-linux
- .
- ((manifest-entry-item . /gnu/store/foo.drv)
- (profile . /gnu/store/bar.drv)))))
+ '(("x86_64-linux"
+ .
+ ((manifest-entry-item . "/gnu/store/foo.drv")
+ (profile . "/gnu/store/bar.drv"))))))
(mock
((guix-data-service jobs load-new-guix-revision)
- setup-logging
- (lambda (conn thunk)
- (thunk)))
+ load-channel-instances
+ (lambda (git-repository-id commit
+ channel-derivations-by-system)
+ 0))
(mock
((guix-data-service jobs load-new-guix-revision)
- channel-derivations-by-system->guix-store-item
- (lambda (store channel-derivations-by-system)
- #f))
+ setup-logging
+ (lambda (conn thunk)
+ (thunk)))
- (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))))))))
+ (mock
+ ((guix-data-service jobs load-new-guix-revision)
+ channel-derivations-by-system->guix-store-item
+ (lambda (store channel-derivations-by-system)
+ #f))
+
+ (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")
@@ -135,43 +142,50 @@
(mock
((guix-data-service jobs load-new-guix-revision)
channel->derivations-by-system
- (lambda (conn store channel)
- '(x86_64-linux
- .
- ((manifest-entry-item . /gnu/store/foo.drv)
- (profile . /gnu/store/bar.drv)))))
+ (lambda (conn store channel fetch-with-authentication?)
+ '(("x86_64-linux"
+ .
+ ((manifest-entry-item . "/gnu/store/foo.drv")
+ (profile . "/gnu/store/bar.drv"))))))
(mock
((guix-data-service jobs load-new-guix-revision)
- setup-logging
- (lambda (conn thunk)
- (thunk)))
+ load-channel-instances
+ (lambda (git-repository-id commit
+ channel-derivations-by-system)
+ 0))
(mock
((guix-data-service jobs load-new-guix-revision)
- channel-derivations-by-system->guix-store-item
- (lambda (store channel-derivations-by-system)
- "/gnu/store/test"))
+ setup-logging
+ (lambda (conn thunk)
+ (thunk)))
(mock
((guix-data-service jobs load-new-guix-revision)
- extract-information-from
- (lambda (conn store git-repository-id commit store-path)
- #f))
+ channel-derivations-by-system->guix-store-item
+ (lambda (store channel-derivations-by-system)
+ "/gnu/store/test"))
(mock
- ((guix channels)
- channel-news-for-commit
- (lambda (channel commit)
- '()))
-
- (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))))))))))
+ ((guix-data-service jobs load-new-guix-revision)
+ extract-information-from
+ (lambda (conn store git-repository-id commit store-path)
+ #f))
+
+ (mock
+ ((guix channels)
+ channel-news-for-commit
+ (lambda (channel commit)
+ '()))
+
+ (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")