me
/
guix
Archived
1
0
Fork 0
Code

tests: Avoid now-deprecated 'make-struct'. 

* tests/cve.scm (vulnerability): Use 'make-struct/no-tail' instead of
'make-struct', which is deprecated.
* tests/lint.scm ("cve: one vulnerability")
("cve: one patched vulnerability")
("cve: known safe from vulnerability")
("cve: vulnerability fixed in replacement version")
("cve: patched vulnerability in replacement"): Likewise.
master
Ludovic Courtès 2019-10-20 22:03:12 +02:00
parent d04285647d
commit 79c03e55e2
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cve.scm
View File

@ -25,7 +25,7 @@
(search-path %load-path "tests/cve-sample.xml")) (search-path %load-path "tests/cve-sample.xml"))
(define (vulnerability id packages) (define (vulnerability id packages)
(make-struct (@@ (guix cve) <vulnerability>) 0 id packages)) (make-struct/no-tail (@@ (guix cve) <vulnerability>) id packages))
(define %expected-vulnerabilities (define %expected-vulnerabilities
;; What we should get when reading %SAMPLE. ;; What we should get when reading %SAMPLE.

40
tests/lint.scm
View File

@ -758,10 +758,10 @@
"probably vulnerable to CVE-2015-1234" "probably vulnerable to CVE-2015-1234"
(mock ((guix lint) package-vulnerabilities (mock ((guix lint) package-vulnerabilities
(lambda (package) (lambda (package)
(list (make-struct (@@ (guix cve) <vulnerability>) 0 (list (make-struct/no-tail (@@ (guix cve) <vulnerability>)
"CVE-2015-1234" "CVE-2015-1234"
(list (cons (package-name package) (list (cons (package-name package)
(package-version package))))))) (package-version package)))))))
(single-lint-warning-message (single-lint-warning-message
(check-vulnerabilities (dummy-package "pi" (version "3.14")))))) (check-vulnerabilities (dummy-package "pi" (version "3.14"))))))
@ -769,10 +769,10 @@
'() '()
(mock ((guix lint) package-vulnerabilities (mock ((guix lint) package-vulnerabilities
(lambda (package) (lambda (package)
(list (make-struct (@@ (guix cve) <vulnerability>) 0 (list (make-struct/no-tail (@@ (guix cve) <vulnerability>)
"CVE-2015-1234" "CVE-2015-1234"
(list (cons (package-name package) (list (cons (package-name package)
(package-version package))))))) (package-version package)))))))
(check-vulnerabilities (check-vulnerabilities
(dummy-package "pi" (dummy-package "pi"
(version "3.14") (version "3.14")
@ -785,10 +785,10 @@
'() '()
(mock ((guix lint) package-vulnerabilities (mock ((guix lint) package-vulnerabilities
(lambda (package) (lambda (package)
(list (make-struct (@@ (guix cve) <vulnerability>) 0 (list (make-struct/no-tail (@@ (guix cve) <vulnerability>)
"CVE-2015-1234" "CVE-2015-1234"
(list (cons (package-name package) (list (cons (package-name package)
(package-version package))))))) (package-version package)))))))
(check-vulnerabilities (check-vulnerabilities
(dummy-package "pi" (dummy-package "pi"
(version "3.14") (version "3.14")
@ -800,10 +800,10 @@
(lambda (package) (lambda (package)
(match (package-version package) (match (package-version package)
("0" ("0"
(list (make-struct (@@ (guix cve) <vulnerability>) 0 (list (make-struct/no-tail (@@ (guix cve) <vulnerability>)
"CVE-2015-1234" "CVE-2015-1234"
(list (cons (package-name package) (list (cons (package-name package)
(package-version package)))))) (package-version package))))))
("1" ("1"
'())))) '()))))
(check-vulnerabilities (check-vulnerabilities
@ -815,10 +815,10 @@
'() '()
(mock ((guix lint) package-vulnerabilities (mock ((guix lint) package-vulnerabilities
(lambda (package) (lambda (package)
(list (make-struct (@@ (guix cve) <vulnerability>) 0 (list (make-struct/no-tail (@@ (guix cve) <vulnerability>)
"CVE-2015-1234" "CVE-2015-1234"
(list (cons (package-name package) (list (cons (package-name package)
(package-version package))))))) (package-version package)))))))
(check-vulnerabilities (check-vulnerabilities
(dummy-package (dummy-package
"pi" (version "3.14") (source (dummy-origin)) "pi" (version "3.14") (source (dummy-origin))