me
/
guix
Archived
1
0
Fork 0
Code

import: cran: Avoid uses of '@@' in the tests. 

* guix/import/cran.scm (description->alist, description->package): Export.
<top level>: Set! 'listify'.
* tests/cran.scm (description-alist, "description->package"): Remove use
of '@@' to access the relevant bindings.
master
Ludovic Courtès 2020-01-16 21:47:36 +01:00
parent 72c678af55
commit cfd1ed8401
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/import/cran.scm
View File

@ -54,7 +54,10 @@
cran-package? cran-package?
bioconductor-package? bioconductor-package?
bioconductor-data-package? bioconductor-data-package?
bioconductor-experiment-package?)) bioconductor-experiment-package?
description->alist
description->package))
;;; Commentary: ;;; Commentary:
;;; ;;;
@ -270,6 +273,10 @@ empty list when the FIELD cannot be found."
(string-any char-set:whitespace item))) (string-any char-set:whitespace item)))
(map string-trim-both items)))))) (map string-trim-both items))))))
;; Trick Guile 3 so that it keeps the 'listify' binding accessible *and*
;; private even though this module is declarative.
(set! listify listify)
(define default-r-packages (define default-r-packages
(list "base" (list "base"
"compiler" "compiler"

6
tests/cran.scm
View File

@ -53,7 +53,7 @@ Date/Publication: 2015-07-14 14:15:16
") ")
(define description-alist (define description-alist
((@@ (guix import cran) description->alist) description)) (description->alist description))
(define simple-alist (define simple-alist
'(("Key" . "Value") '(("Key" . "Value")
@ -72,7 +72,7 @@ Date/Publication: 2015-07-14 14:15:16
"Date/Publication"))) "Date/Publication")))
(lset= string=? keys (map car description-alist)))) (lset= string=? keys (map car description-alist))))
(test-equal "listify: return empty list if key cannot be found" (test-equal "listifyx: return empty list if key cannot be found"
'() '()
((@@ (guix import cran) listify) simple-alist "Letters")) ((@@ (guix import cran) listify) simple-alist "Letters"))
@ -105,7 +105,7 @@ Date/Publication: 2015-07-14 14:15:16
("mirror://cran/src/contrib/My-Example_1.2.3.tar.gz" ("mirror://cran/src/contrib/My-Example_1.2.3.tar.gz"
"source") "source")
(_ (error "Unexpected URL: " url)))))))) (_ (error "Unexpected URL: " url))))))))
(match ((@@ (guix import cran) description->package) 'cran description-alist) (match (description->package 'cran description-alist)
(('package (('package
('name "r-my-example") ('name "r-my-example")
('version "1.2.3") ('version "1.2.3")