[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/21: tests: upstream: Restore test that was skipped.
From: |
guix-commits |
Subject: |
12/21: tests: upstream: Restore test that was skipped. |
Date: |
Wed, 31 May 2023 17:52:50 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 5d022d5563f35856963e31a682d9795abca85051
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed May 17 17:02:16 2023 +0200
tests: upstream: Restore test that was skipped.
This test was being skipped since
ea6fb108f6a3a53d48ea187b1f82b5f7ffce00a7.
* tests/upstream.scm ("coalesce-sources same version"): Compare a
serialized form of <upstream-source>.
---
tests/upstream.scm | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/tests/upstream.scm b/tests/upstream.scm
index b82579228a..a94bb66068 100644
--- a/tests/upstream.scm
+++ b/tests/upstream.scm
@@ -32,26 +32,27 @@
(test-begin "upstream")
-;; FIXME: Temporarily skipping this test; see <https://bugs.gnu.org/34229>.
-(test-skip 1)
-
(test-equal "coalesce-sources same version"
- (list (upstream-source
- (package "foo") (version "1")
- (urls '("ftp://example.org/foo-1.tar.xz"
- "ftp://example.org/foo-1.tar.gz"))
- (signature-urls '("ftp://example.org/foo-1.tar.xz.sig"
- "ftp://example.org/foo-1.tar.gz.sig"))))
+ '((source "foo" "1"
+ ("ftp://example.org/foo-1.tar.xz"
+ "ftp://example.org/foo-1.tar.gz")
+ ("ftp://example.org/foo-1.tar.xz.sig"
+ "ftp://example.org/foo-1.tar.gz.sig")))
- (coalesce-sources (list (upstream-source
- (package "foo") (version "1")
- (urls '("ftp://example.org/foo-1.tar.gz"))
- (signature-urls
- '("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"))))))
+ (map (lambda (source)
+ `(source ,(upstream-source-package source)
+ ,(upstream-source-version source)
+ ,(upstream-source-urls source)
+ ,(upstream-source-signature-urls source)))
+ (coalesce-sources (list (upstream-source
+ (package "foo") (version "1")
+ (urls '("ftp://example.org/foo-1.tar.gz"))
+ (signature-urls
+ '("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)
- branch master updated (60895810ad -> 654fcf9971), guix-commits, 2023/05/31
- 01/21: transformations: Add "--tune" to "--help-transform"., guix-commits, 2023/05/31
- 06/21: import: json: Add #:timeout to 'json-fetch'., guix-commits, 2023/05/31
- 08/21: upstream: Replace 'input-changes' field by 'inputs'., guix-commits, 2023/05/31
- 02/21: tests: pypi: Factorize tarball and wheel file creation., guix-commits, 2023/05/31
- 09/21: diagnostics: Factorize 'absolute-location'., guix-commits, 2023/05/31
- 07/21: doc: Mention 'guix refresh -u' for third-party channels., guix-commits, 2023/05/31
- 11/21: upstream: Remove <upstream-input-change> and related code., guix-commits, 2023/05/31
- 10/21: upstream: 'update-package-source' edits input fields., guix-commits, 2023/05/31
- 12/21: tests: upstream: Restore test that was skipped.,
guix-commits <=
- 16/21: import: elpa: Updater provides input list., guix-commits, 2023/05/31
- 20/21: gnu: Add updater input properties for R and Python packages., guix-commits, 2023/05/31
- 21/21: tests: Use quasiquoted 'match' patterns for package sexps., guix-commits, 2023/05/31
- 05/21: import: utils: 'call-with-networking-exception-handler' doesn't unwind., guix-commits, 2023/05/31
- 04/21: tests: pypi: Rewrite tests using a local HTTP server., guix-commits, 2023/05/31
- 14/21: import: cpan: Represent dependencies as <upstream-input> records., guix-commits, 2023/05/31
- 15/21: import: cpan: Updater provides input list., guix-commits, 2023/05/31
- 19/21: upstream: Honor package properties for ignored and extra inputs., guix-commits, 2023/05/31
- 13/21: import: cpan: Remove unary 'string-append' call., guix-commits, 2023/05/31
- 18/21: import: gem: Updater provides input list., guix-commits, 2023/05/31