[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#63571] [PATCH v2 11/19] tests: upstream: Restore test that was skip
From: |
Ludovic Courtès |
Subject: |
[bug#63571] [PATCH v2 11/19] tests: upstream: Restore test that was skipped. |
Date: |
Mon, 29 May 2023 16:45:22 +0200 |
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 @@ (define-module (test-upstream)
(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)
--
2.40.1
- [bug#63571] [PATCH 00/14] 'guix refresh -u' updates input fields, (continued)
- [bug#63571] [PATCH 00/14] 'guix refresh -u' updates input fields, Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 01/19] tests: pypi: Factorize tarball and wheel file creation., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 02/19] tests: http: Allow responses to specify a path., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 04/19] import: utils: 'call-with-networking-exception-handler' doesn't unwind., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 03/19] tests: pypi: Rewrite tests using a local HTTP server., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 09/19] upstream: 'update-package-source' edits input fields., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 13/19] import: cpan: Represent dependencies as <upstream-input> records., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 15/19] import: elpa: Updater provides input list., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 05/19] import: json: Add #:timeout to 'json-fetch'., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 06/19] doc: Mention 'guix refresh -u' for third-party channels., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 11/19] tests: upstream: Restore test that was skipped.,
Ludovic Courtès <=
- [bug#63571] [PATCH v2 08/19] diagnostics: Factorize 'absolute-location'., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 10/19] upstream: Remove <upstream-input-change> and related code., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 14/19] import: cpan: Updater provides input list., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 12/19] import: cpan: Remove unary 'string-append' call., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 19/19] gnu: Add updater input properties for R and Python packages., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 18/19] upstream: Honor package properties for ignored and extra inputs., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 17/19] import: gem: Updater provides input list., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 16/19] import: gem: Factorize "bundler" special case for name mapping., Ludovic Courtès, 2023/05/29
- [bug#63571] [PATCH v2 07/19] upstream: Replace 'input-changes' field by 'inputs'., Ludovic Courtès, 2023/05/29
- bug#63571: [PATCH 00/14] 'guix refresh -u' updates input fields, Ludovic Courtès, 2023/05/31