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

Adapt some license related code to work without mock in the tests

Browse source 
With Guile 3, there's a potential for mock to work in even fewer
circumstances. So, adapt the code to enable writing the tests without mock.
This commit is contained in:
Christopher Baines 2020-02-24 21:35:44 +00:00
parent ce10833459
commit 2f41fe79be
7 changed files with 88 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@
#:use-module (guix-data-service model guix-revision)
#:use-module (guix-data-service model package-derivation)
#:use-module (guix-data-service model guix-revision-package-derivation)
#:use-module (guix-data-service model license)
#:use-module (guix-data-service model license-set)
#:use-module (guix-data-service model lint-checker)
#:use-module (guix-data-service model lint-warning)
@ -626,8 +627,11 @@ WHERE job_id = $1"
(define (insert-packages conn inf packages)
(let* ((package-license-set-ids
(with-time-logging "fetching inferior package license metadata"
(inferior-packages->license-set-ids conn inf
packages)))
(inferior-packages->license-set-ids
conn
(inferior-packages->license-id-lists
conn
(inferior-packages->license-data inf packages)))))
(packages-metadata-ids
(with-time-logging "fetching inferior package metadata"
(inferior-packages->package-metadata-ids

5
guix-data-service/model/license-set.scm
View file

@ -44,10 +44,7 @@ FROM license_sets")
", ")
" RETURNING id"))
(define (inferior-packages->license-set-ids conn inf packages)
(define license-id-lists
(inferior-packages->license-id-lists conn inf packages))
(define (inferior-packages->license-set-ids conn license-id-lists)
(let* ((unique-license-id-lists (delete-duplicates
license-id-lists))
(existing-license-sets

8
guix-data-service/model/license.scm
View file

@ -22,7 +22,8 @@
#:use-module (squee)
#:use-module (guix inferior)
#:use-module (guix-data-service model utils)
#:export (inferior-packages->license-id-lists))
#:export (inferior-packages->license-id-lists
inferior-packages->license-data))
(define inferior-package-id
(@@ (guix inferior) inferior-package-id))
@ -61,10 +62,7 @@
(inferior-eval '(use-modules (guix licenses)) inf)
(inferior-eval (proc packages) inf))
(define (inferior-packages->license-id-lists conn inf packages)
(define license-data
(inferior-packages->license-data inf packages))
(define (inferior-packages->license-id-lists conn license-data)
(define (string-or-null v)
(if (string? v)
v