From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2CLWAgq7dGQPcwEASxT56A (envelope-from ) for ; Mon, 29 May 2023 16:47:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MBhIAQq7dGRaKgAAG6o9tA (envelope-from ) for ; Mon, 29 May 2023 16:47:38 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BA7DB30F8D for ; Mon, 29 May 2023 16:47:37 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3e9S-00028S-4Z; Mon, 29 May 2023 10:47:14 -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 1q3e9K-00022Y-1g for guix-patches@gnu.org; Mon, 29 May 2023 10:47:06 -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 1q3e9J-00033g-Pt for guix-patches@gnu.org; Mon, 29 May 2023 10:47:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3e9J-0001Pc-MM for guix-patches@gnu.org; Mon, 29 May 2023 10:47:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63571] [PATCH v2 11/19] 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: Mon, 29 May 2023 14:47: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.16853716005274 (code B ref 63571); Mon, 29 May 2023 14:47:05 +0000 Received: (at 63571) by debbugs.gnu.org; 29 May 2023 14:46:40 +0000 Received: from localhost ([127.0.0.1]:58783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3e8t-0001Mt-L3 for submit@debbugs.gnu.org; Mon, 29 May 2023 10:46:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3e8D-0001Iy-N2 for 63571@debbugs.gnu.org; Mon, 29 May 2023 10:45:58 -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 1q3e88-0002fC-GP; Mon, 29 May 2023 10:45:52 -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=Wbqd4To+1mnV8j4FNSZu nQKekjlLYWL1FEHtNKpWa/MMyfyzjXM+v3GrUqCy38FSfohueCMW5n7EUBA2AHmcmlJuYdodDbCx6 g81OXiVQcfRiQc1ZEby3GCdpL0Yzmz0MIJ3zG1niLEFV2cdFCRM66GNClWiXUrTx+EGfIac5o5X+U 2GYb7sCheE8Lfg8EHAmpVxbcmOGXsVNG8rRJZdWKQUgrUXLlnWURiJv0n5J8jYkyhFMBirVuPS9KE 2dd5pVSJrutHhFAxJjfoMuVwf7uFRkm1BxRQQ5+N2c65IvT7Mtf+eYbYmhcZAFfsAvJVjszhR8vjT mbROrxPHSt2bBw==; 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 1q3e88-00044B-3N; Mon, 29 May 2023 10:45:52 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 29 May 2023 16:45:22 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <87y1l7fb9j.fsf@gnu.org> References: <87y1l7fb9j.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685371657; a=rsa-sha256; cv=none; b=m31/G7TK57HfinGUYWpioo8HchZkINC6YxD/OhOgrRy8cUrdgyjL9znY01fRYrhoz4tHYt AsFb+VOhsW0lNMZDAHvXm5/pGyREd59jJlfvjZMi1xMu3EKqNVglWqu/gy7tZ1/md2l92A 6D5oYKpBtOHGWQQGZzDKi5JJvy0tJlCdTMPRWf6j+Y1l7oa9/LjNUxa2bMNWjQqRqBvrYx vtHy44ELbACEAfFGlcwzKCcfL3WDA41dH6mAhOlgi83qEVBJkwwM+Ne/oQf2+x4frEDxtC FXyb2kN3Iiq7Mj10HrsYIPFTsJAFUxP618eQWe1sRU8N+nrUVOnBJJ98xGhn4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=Wbqd4To+; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685371657; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ar+KjOpNrttysngzUmPOggZQ4X0k7604YnXYQb00D4I=; b=lsKXjcZsLzJDVPakZN8w5kBi+ae5sbNn4VvsyX5BHdym2xJZ/A8a5xwzyww3y8UwDwjXIj KycV9WvUFeJ8QK4pQzECv169LeTj7WRnF3/0gBldCPTexcbdMUA11Dfomq8GAu0xwPuCuy NTbOHv6y2Qtcc0aDdZHkc7Rr7LISbDURkOvLAtFKYUR2JtxoZka7+Yck6FdBKDoQYUDAO2 30xyl9XEFf9EbNFTew0jtnuEPqVIroW/o3Ooxg4mNqevFsGbLihTDWF6DBDsjrrP6T+mh8 TBf458qWVf69ol9mAR8c5/GvO0K7bE/rdHzprHzxqz+QNZP3lnCk6FIYcFey/g== X-Migadu-Spam-Score: -2.11 X-Spam-Score: -2.11 X-Migadu-Queue-Id: BA7DB30F8D X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=Wbqd4To+; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: MuNAaAkFfV0s 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) -- 2.40.1