[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/13: Fixup tests
From: |
Christopher Baines |
Subject: |
11/13: Fixup tests |
Date: |
Fri, 19 Jan 2024 04:57:47 -0500 (EST) |
cbaines pushed a commit to branch master
in repository data-service.
commit b81e7ea9500ba67ef498e5669b6facfe7acd1600
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu Jan 18 15:25:41 2024 +0000
Fixup tests
---
guix-data-service/model/package-metadata.scm | 8 +++++---
tests/jobs-load-new-guix-revision.scm | 6 ++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/guix-data-service/model/package-metadata.scm
b/guix-data-service/model/package-metadata.scm
index aaaee68..17f4e10 100644
--- a/guix-data-service/model/package-metadata.scm
+++ b/guix-data-service/model/package-metadata.scm
@@ -410,9 +410,11 @@ WHERE packages.id IN (
(with-time-logging "preparing location ids"
(map (match-lambda
((_ location rest ...)
- (location->location-id
- conn
- location)))
+ (if location
+ (location->location-id
+ conn
+ location)
+ NULL)))
package-metadata))
license-set-ids
(with-time-logging "preparing package description set ids"
diff --git a/tests/jobs-load-new-guix-revision.scm
b/tests/jobs-load-new-guix-revision.scm
index 8213afb..a2beb64 100644
--- a/tests/jobs-load-new-guix-revision.scm
+++ b/tests/jobs-load-new-guix-revision.scm
@@ -38,7 +38,8 @@
(mock
((guix-data-service jobs load-new-guix-revision)
channel->source-and-derivations-by-system
- (lambda (conn store channel fetch-with-authentication?)
+ (lambda* (conn store channel fetch-with-authentication?
+ #:key parallelism)
(cons
"/gnu/store/guix"
'(("x86_64-linux"
@@ -57,7 +58,8 @@
extract-information-from
(lambda* (conn store guix-revision-id commit
guix-source store-path
- #:key skip-system-tests?)
+ #:key skip-system-tests?
+ parallelism)
#t))
(mock
- branch master updated (241d7e4 -> e0a6c84), Christopher Baines, 2024/01/19
- 04/13: Have delete-duplicates/sort! take a equality procedure, Christopher Baines, 2024/01/19
- 07/13: Fix par-map&, Christopher Baines, 2024/01/19
- 09/13: Split and instrument parts of inferior-packages->package-metadata-ids, Christopher Baines, 2024/01/19
- 08/13: Rewrite part of insert-missing-data-and-return-all-ids to avoid filter, Christopher Baines, 2024/01/19
- 11/13: Fixup tests,
Christopher Baines <=
- 13/13: Try to fix issues with derivations being GC'ed, Christopher Baines, 2024/01/19
- 10/13: Add meaningful parallelism to processing jobs, Christopher Baines, 2024/01/19
- 03/13: Add back inferior heap size reporting, Christopher Baines, 2024/01/19
- 05/13: Make it possible to destroy a resource pool, Christopher Baines, 2024/01/19
- 02/13: Use delete-duplicates/sort! in inferior-packages->license-set-ids, Christopher Baines, 2024/01/19
- 01/13: Use delete-duplicates/sort! in insert-missing-data-and-return-all-ids, Christopher Baines, 2024/01/19
- 12/13: Remove drain? #t from process job, Christopher Baines, 2024/01/19
- 06/13: Show backtraces when using parallel fibers and resource pools, Christopher Baines, 2024/01/19