From patchwork Thu May 18 15:16:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50113 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0DF2F27BBE2; Thu, 18 May 2023 16:18:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7A79E17A6F for ; Thu, 18 May 2023 16:18:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzfNh-0003ez-0j; Thu, 18 May 2023 11:17:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzfNJ-0003KC-MU for guix-patches@gnu.org; Thu, 18 May 2023 11:17:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzfNJ-0001yb-Dh for guix-patches@gnu.org; Thu, 18 May 2023 11:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzfNJ-0005UU-9Y for guix-patches@gnu.org; Thu, 18 May 2023 11:17:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63571] [PATCH 10/14] tests: upstream: Restore test that was skipped. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 15:17:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63571@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 63571-submit@debbugs.gnu.org id=B63571.168442301621025 (code B ref 63571); Thu, 18 May 2023 15:17:05 +0000 Received: (at 63571) by debbugs.gnu.org; 18 May 2023 15:16:56 +0000 Received: from localhost ([127.0.0.1]:54130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzfNA-0005Sx-0a for submit@debbugs.gnu.org; Thu, 18 May 2023 11:16:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzfN0-0005Qd-Ri for 63571@debbugs.gnu.org; Thu, 18 May 2023 11:16:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzfMv-0001vv-LR; Thu, 18 May 2023 11:16:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=fOHBE1IFLZ7OiJkXP7oWiJN1CSAmLviMfv/zd8cpwYY=; b=QqkLyrDKQ+MbGmfBfEdL zCIN1xEldbAkVsTQBqOkwX9Ti57BE4fpVKDqwYyTwFynQztt88TTgZq2vyha6Yy87erCnBRPsANvT SF6dUgnI2KeBAtbSi8cqmBmeYSl1EduhP6LbrkV33Sl8AvEiC3kumJtTXoV2v4PwohrbSaG3g04v1 A0BhuAeHMz+vI9H64J50XeFuMdz516NtvJBGGv/jTMlA+qgSQ3HdOIHnbTtczCegD6ZNmgsinh2bX MN+cXUnmMVUNOv+uSAVvNhnnPcjHET5TPQPEv0FyZrajMEaV/2xSMIvO6urDAeDU3YBh6rQyj80rz mtcNSmrfRsKhzg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzfMv-0007G6-8p; Thu, 18 May 2023 11:16:41 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 18 May 2023 17:16:18 +0200 Message-Id: <4b4364fda21d0ff3dc4657567dca4b47f6af4ec8.1684421460.git.ludo@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This test was being skipped since ea6fb108f6a3a53d48ea187b1f82b5f7ffce00a7. * tests/upstream.scm ("coalesce-sources same version"): Compare a serialized form of . --- 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 . -(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)