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

Fix the test-model-package test

Browse source 
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Danjela Lura 2020-06-19 14:15:38 +02:00 • committed by Christopher Baines
parent a3ac33c0e1
commit 365bf27838
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
guix-data-service/model/package-metadata.scm
View file

@ -27,10 +27,12 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (guix inferior) #:use-module (guix inferior)
#:use-module (guix-data-service utils)
#:use-module (guix-data-service model location) #:use-module (guix-data-service model location)
#:use-module (guix-data-service model utils) #:use-module (guix-data-service model utils)
#:export (select-package-metadata-by-revision-name-and-version #:export (select-package-metadata-by-revision-name-and-version
inferior-packages->package-metadata-ids inferior-packages->package-metadata-ids
inferior-packages->translated-package-descriptions-and-synopsis
package-description-and-synopsis-locale-options-guix-revision)) package-description-and-synopsis-locale-options-guix-revision))
@ -203,9 +205,9 @@ WHERE packages.id IN (
";")) ";"))
(define (inferior-packages->translated-package-descriptions-and-synopsis inferior (define (inferior-packages->translated-package-descriptions-and-synopsis inferior
inferior-package-id) inferior-package)
(define (translate inferior-package) (define (translate inferior-package-id)
`(let* ((package (hashv-ref %package-table ,inferior-package-id)) `(let* ((package (hashv-ref %package-table ,inferior-package-id))
(source-locale "en_US.utf8") (source-locale "en_US.utf8")
(source-synopsis (source-synopsis
@ -260,7 +262,9 @@ WHERE packages.id IN (
(cons (cons source-locale source-synopsis) (cons (cons source-locale source-synopsis)
synopsis-by-locale)))) synopsis-by-locale))))
(inferior-eval (translate inferior-package-id) inferior)) (inferior-eval (translate (inferior-package-id inferior-package)) inferior))
(prevent-inlining-for-tests inferior-packages->translated-package-descriptions-and-synopsis)
(define (package-synopsis-data->package-synopsis-ids (define (package-synopsis-data->package-synopsis-ids
conn synopsis-by-locale) conn synopsis-by-locale)
@ -366,7 +370,7 @@ WHERE packages.id IN (
(map (lambda (package license-set-id) (map (lambda (package license-set-id)
(let ((translated-package-descriptions-and-synopsis (let ((translated-package-descriptions-and-synopsis
(inferior-packages->translated-package-descriptions-and-synopsis (inferior-packages->translated-package-descriptions-and-synopsis
inferior (inferior-package-id package)))) inferior package)))
(list (non-empty-string-or-false (list (non-empty-string-or-false
(inferior-package-home-page package)) (inferior-package-home-page package))
(location->location-id (location->location-id

10
tests/model-package.scm
View file

@ -45,6 +45,12 @@
(list mock-inferior-package-foo (list mock-inferior-package-foo
mock-inferior-package-foo-2)) mock-inferior-package-foo-2))
(mock
((guix-data-service model package-metadata)
inferior-packages->translated-package-descriptions-and-synopsis
(lambda (inferior inferior-package)
(cons `(("en_US.utf8" . "Fake synopsis"))
`(("en_US.utf8" . "Fake description")))))
(with-mock-inferior-packages (with-mock-inferior-packages
(lambda () (lambda ()
(use-modules (guix-data-service model package) (use-modules (guix-data-service model package)
@ -63,6 +69,7 @@
(test-assert "inferior-packages->package-ids works once" (test-assert "inferior-packages->package-ids works once"
(let ((package-metadata-ids (inferior-packages->package-metadata-ids (let ((package-metadata-ids (inferior-packages->package-metadata-ids
conn conn
""
mock-inferior-packages mock-inferior-packages
(test-license-set-ids conn)))) (test-license-set-ids conn))))
(match (inferior-packages->package-ids (match (inferior-packages->package-ids
@ -78,6 +85,7 @@
(lambda (conn) (lambda (conn)
(let ((package-metadata-ids (inferior-packages->package-metadata-ids (let ((package-metadata-ids (inferior-packages->package-metadata-ids
conn conn
""
mock-inferior-packages mock-inferior-packages
(test-license-set-ids conn)))) (test-license-set-ids conn))))
(test-equal (test-equal
@ -91,6 +99,6 @@
(zip (map mock-inferior-package-name mock-inferior-packages) (zip (map mock-inferior-package-name mock-inferior-packages)
(map mock-inferior-package-version mock-inferior-packages) (map mock-inferior-package-version mock-inferior-packages)
package-metadata-ids))))) package-metadata-ids)))))
#:always-rollback? #t))))) #:always-rollback? #t))))))
(test-end) (test-end)