From 5d022d5563f35856963e31a682d9795abca85051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 17 May 2023 17:02:16 +0200
Subject: [PATCH] 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 @@ (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)