From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 52DBC15808B for ; Mon, 14 Feb 2022 00:14:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 571F4E0849; Mon, 14 Feb 2022 00:14:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28062E0849 for ; Mon, 14 Feb 2022 00:14:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FDB7342E17 for ; Mon, 14 Feb 2022 00:14:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7839F1F1 for ; Mon, 14 Feb 2022 00:14:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1644797585.041763a8b7cda7dac0b75aa4a85eb73f333b7e55.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/tests/resolver/test_installkernel.py X-VCS-Directories: lib/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 041763a8b7cda7dac0b75aa4a85eb73f333b7e55 X-VCS-Branch: master Date: Mon, 14 Feb 2022 00:14:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3665f5c5-3057-4183-b3f9-bf5e434f6056 X-Archives-Hash: 80764c6f7a86bac2e082a8eaef756531 commit: 041763a8b7cda7dac0b75aa4a85eb73f333b7e55 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 14 00:11:43 2022 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 00:13:05 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=041763a8 Add unit test to reproduce bug 833014 Bug: https://bugs.gentoo.org/833014 Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_installkernel.py | 111 +++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/lib/portage/tests/resolver/test_installkernel.py b/lib/portage/tests/resolver/test_installkernel.py new file mode 100644 index 000000000..b73bbe5bb --- /dev/null +++ b/lib/portage/tests/resolver/test_installkernel.py @@ -0,0 +1,111 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +from portage.tests import TestCase +from portage.tests.resolver.ResolverPlayground import ( + ResolverPlayground, + ResolverPlaygroundTestCase, +) + + +class InstallKernelTestCase(TestCase): + def testInstallKernel(self): + ebuilds = { + "sys-kernel/installkernel-systemd-boot-1": { + "EAPI": "8", + "RDEPEND": "!sys-kernel/installkernel-gentoo", + }, + "sys-kernel/installkernel-gentoo-3": { + "EAPI": "8", + "RDEPEND": "!sys-kernel/installkernel-systemd-boot", + }, + "sys-kernel/gentoo-kernel-5.15.23": { + "EAPI": "8", + "PDEPEND": ">=virtual/dist-kernel-5.15.23", + "RDEPEND": "|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot )", + }, + "sys-kernel/gentoo-kernel-bin-5.15.23": { + "EAPI": "8", + "PDEPEND": ">=virtual/dist-kernel-5.15.23", + "RDEPEND": "|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot )", + }, + "virtual/dist-kernel-5.15.23": { + "EAPI": "8", + "PDEPEND": "|| ( ~sys-kernel/gentoo-kernel-5.15.23 ~sys-kernel/gentoo-kernel-bin-5.15.23 )", + }, + } + + installed = { + "sys-kernel/installkernel-gentoo-3": { + "EAPI": "8", + "RDEPEND": "!sys-kernel/installkernel-systemd-boot", + }, + } + + test_cases = ( + ResolverPlaygroundTestCase( + [ + "sys-kernel/installkernel-systemd-boot", + ], + ambiguous_merge_order=True, + success=True, + mergelist=[ + "sys-kernel/installkernel-systemd-boot-1", + "[uninstall]sys-kernel/installkernel-gentoo-3", + ( + "!sys-kernel/installkernel-gentoo", + "!sys-kernel/installkernel-systemd-boot", + ), + ], + ), + # Demonstrate bug 833014, where the calculation fails unless + # --update and --deep are specified. + ResolverPlaygroundTestCase( + [ + "sys-kernel/installkernel-systemd-boot", + "sys-kernel/gentoo-kernel-bin", + ], + ambiguous_merge_order=True, + success=False, + mergelist=[ + "sys-kernel/installkernel-systemd-boot-1", + "sys-kernel/gentoo-kernel-bin-5.15.23", + "virtual/dist-kernel-5.15.23", + ( + "!sys-kernel/installkernel-gentoo", + "!sys-kernel/installkernel-systemd-boot", + ), + ], + ), + ResolverPlaygroundTestCase( + [ + "sys-kernel/installkernel-systemd-boot", + "sys-kernel/gentoo-kernel-bin", + ], + ambiguous_merge_order=True, + success=True, + options={"--deep": True, "--update": True}, + mergelist=[ + "virtual/dist-kernel-5.15.23", + "sys-kernel/installkernel-systemd-boot-1", + "sys-kernel/gentoo-kernel-bin-5.15.23", + "[uninstall]sys-kernel/installkernel-gentoo-3", + ( + "!sys-kernel/installkernel-systemd-boot", + "!sys-kernel/installkernel-gentoo", + ), + ], + ), + ) + + playground = ResolverPlayground( + debug=False, ebuilds=ebuilds, installed=installed + ) + + try: + for test_case in test_cases: + playground.run_TestCase(test_case) + self.assertEqual(test_case.test_success, True, test_case.fail_msg) + finally: + playground.debug = False + playground.cleanup()