mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
tests: upstream: Restore test that was skipped.
This test was being skipped since
ea6fb108f6
.
* tests/upstream.scm ("coalesce-sources same version"): Compare a
serialized form of <upstream-source>.
This commit is contained in:
parent
cd262c403f
commit
5d022d5563
1 changed files with 20 additions and 19 deletions
|
@ -32,26 +32,27 @@ (define-module (test-upstream)
|
||||||
|
|
||||||
(test-begin "upstream")
|
(test-begin "upstream")
|
||||||
|
|
||||||
;; FIXME: Temporarily skipping this test; see <https://bugs.gnu.org/34229>.
|
|
||||||
(test-skip 1)
|
|
||||||
|
|
||||||
(test-equal "coalesce-sources same version"
|
(test-equal "coalesce-sources same version"
|
||||||
(list (upstream-source
|
'((source "foo" "1"
|
||||||
(package "foo") (version "1")
|
("ftp://example.org/foo-1.tar.xz"
|
||||||
(urls '("ftp://example.org/foo-1.tar.xz"
|
"ftp://example.org/foo-1.tar.gz")
|
||||||
"ftp://example.org/foo-1.tar.gz"))
|
("ftp://example.org/foo-1.tar.xz.sig"
|
||||||
(signature-urls '("ftp://example.org/foo-1.tar.xz.sig"
|
"ftp://example.org/foo-1.tar.gz.sig")))
|
||||||
"ftp://example.org/foo-1.tar.gz.sig"))))
|
|
||||||
|
|
||||||
(coalesce-sources (list (upstream-source
|
(map (lambda (source)
|
||||||
(package "foo") (version "1")
|
`(source ,(upstream-source-package source)
|
||||||
(urls '("ftp://example.org/foo-1.tar.gz"))
|
,(upstream-source-version source)
|
||||||
(signature-urls
|
,(upstream-source-urls source)
|
||||||
'("ftp://example.org/foo-1.tar.gz.sig")))
|
,(upstream-source-signature-urls source)))
|
||||||
(upstream-source
|
(coalesce-sources (list (upstream-source
|
||||||
(package "foo") (version "1")
|
(package "foo") (version "1")
|
||||||
(urls '("ftp://example.org/foo-1.tar.xz"))
|
(urls '("ftp://example.org/foo-1.tar.gz"))
|
||||||
(signature-urls
|
(signature-urls
|
||||||
'("ftp://example.org/foo-1.tar.xz.sig"))))))
|
'("ftp://example.org/foo-1.tar.gz.sig")))
|
||||||
|
(upstream-source
|
||||||
|
(package "foo") (version "1")
|
||||||
|
(urls '("ftp://example.org/foo-1.tar.xz"))
|
||||||
|
(signature-urls
|
||||||
|
'("ftp://example.org/foo-1.tar.xz.sig")))))))
|
||||||
|
|
||||||
(test-end)
|
(test-end)
|
||||||
|
|
Loading…
Reference in a new issue