From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iDuMLZ4+lmL3NgAAbAwnHQ (envelope-from ) for ; Tue, 31 May 2022 18:13:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2F6DLJ4+lmK2BgEAG6o9tA (envelope-from ) for ; Tue, 31 May 2022 18:13:18 +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 68B2E17683 for ; Tue, 31 May 2022 18:13:18 +0200 (CEST) Received: from localhost ([::1]:36820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nw4Ud-0007DM-35 for larch@yhetil.org; Tue, 31 May 2022 12:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nw4RY-0006Dj-GZ for bug-guix@gnu.org; Tue, 31 May 2022 12:10:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nw4RY-0002c9-6s for bug-guix@gnu.org; Tue, 31 May 2022 12:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nw4RY-0004Ot-0r for bug-guix@gnu.org; Tue, 31 May 2022 12:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#55499: [PATCH 1/3] tests: Augment profile collision test. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 31 May 2022 16:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55499 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 55499@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 55499-submit@debbugs.gnu.org id=B55499.165401339816874 (code B ref 55499); Tue, 31 May 2022 16:10:03 +0000 Received: (at 55499) by debbugs.gnu.org; 31 May 2022 16:09:58 +0000 Received: from localhost ([127.0.0.1]:48731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nw4RR-0004O0-PP for submit@debbugs.gnu.org; Tue, 31 May 2022 12:09:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nw4RJ-0004N7-0b for 55499@debbugs.gnu.org; Tue, 31 May 2022 12:09:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nw4RD-0002Ll-PV; Tue, 31 May 2022 12:09:43 -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=qihHKTPRSaOMn8OoQQhfdaq7/RB4JCTYhzo1ERcbFXM=; b=bsh+6zZIM2yExtEm3Hgi CsUra3JSEnAJ7CPOBw/80iNJrbBxI3SkNNgnKPw6t1HFGW6qAlTaaQ5bGMr2QUjwfV3uBfReBIjah gFVEEMBMg5KxMhgvpOVR9hXJ5LkWeezzvD6WDQU7/TyKmfLumYioClDIGb0fvYMswxP5lO6vHQQTZ /KAbsB2xvqjlG105PA0HY8CpDRuigNKCmBhYciobgdr6iiN0WXn24M5SyY4UgtLTLEc9TRyOXNKuK DrcrFF/vvtfPNCnuftwC50SLllGyek1G7lSmgNgv+MIzo8xuH9WlQ46EPOIKzcDyM9Kosx0Ei1mbF 8/CWOzJWmjFvPQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=52502 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nw4RD-00067m-0X; Tue, 31 May 2022 12:09:43 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 31 May 2022 18:09:14 +0200 Message-Id: <20220531160916.21508-2-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220531160916.21508-1-ludo@gnu.org> References: <87sfp7kkim.fsf@elephly.net> <20220531160916.21508-1-ludo@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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654013598; 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=qihHKTPRSaOMn8OoQQhfdaq7/RB4JCTYhzo1ERcbFXM=; b=LbYOLtkIfySzIGjva/vH/Y4iECnciRqN/rmjoJ5QOA/+uSSU2pFDPEO9hXCMz5u/sjCOiI vbQJl8U97QjJZNk1zopbiU3ukrMs9PRRrCsD/zeNR8rAiDxuN2JVcFI1LZonKMidY35MFv ouwDooxxqr4/yyM/2vh/fReIVt4AmDd09UwAQaspqAs5+5G2WyHN5sGoYnnX/WCvFWJxgL JietJ+2/pHfcI/DIgJ54x6UQNCxeTNB4WV9a0Xl1FQAQU+VSysAVG5YxKxdAYZbr1UXE91 rSCl65oIJml9uR8qo7VhIkvQW7ACgZQ0LDLdS7mt9BJ+65fZXMk8Ss5wL0m6iA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654013598; a=rsa-sha256; cv=none; b=nRuo1IZUBU42j01WXn9d9FXjJbe/Q67jlyOmEaKEHckZjbX/MyvVO8bu9ZmI5LKrTvR9a9 NV9t4z1RKqpCYOlNBLgzHt5zQSwZZS6Ic3vWEM21z4826rEcBfcQwCw3Is+ZKAbDEwTv3X P3FqEZpAL5MPDOrMc94jP/7Nujhmi8ZORwXGdNy1xBhvf3VJtmKWOahWB/TRLDW/t3vPoe Vv/i6qgMfnPXW2cPaJfjH4+K/l7z0goR8rhdVB3eCoiRF01/WUEaLKN3Vkc8fH6iEVI9s7 qo+ibck9eQqPYMPqQb4W/PSfsN4cQLlOumOH89KdRmKOmQ2vqXBnsPirof0FOA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=bsh+6zZI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.24 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=bsh+6zZI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 68B2E17683 X-Spam-Score: -3.24 X-Migadu-Scanner: scn0.migadu.com X-TUID: qPn86hBEUYM9 * tests/profiles.scm ("collision of propagated inputs"): Check the parents of ENTRY1 and ENTRY2. --- tests/profiles.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/profiles.scm b/tests/profiles.scm index d59d75985f..7e51d37ab9 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -556,14 +556,20 @@ (define (entry->sexp entry) (return #f))))) (test-equal "collision of propagated inputs" - '(("guile-bootstrap" "2.0") ("guile-bootstrap" "42")) + '(("guile-bootstrap" "2.0") "p1" + <> ("guile-bootstrap" "42") "p2") (guard (c ((profile-collision-error? c) (let ((entry1 (profile-collision-error-entry c)) (entry2 (profile-collision-error-conflict c))) (list (list (manifest-entry-name entry1) (manifest-entry-version entry1)) + (manifest-entry-name + (force (manifest-entry-parent entry1))) + '<> (list (manifest-entry-name entry2) - (manifest-entry-version entry2)))))) + (manifest-entry-version entry2)) + (manifest-entry-name + (force (manifest-entry-parent entry2))))))) (run-with-store %store (mlet* %store-monad ((p0 -> (package (inherit %bootstrap-guile) -- 2.36.1