commit: 13580e4485201860ca4afd5d5fefc70f71bbd6c5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Nov 15 05:59:53 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Nov 15 06:00:06 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=13580e44
OnlydepsMinimalTestCase: fix testcase Adjust the test results to include the IDEPEND contents where appropriate. Followup to ccb151319a16c0c3f6c540ca887040426474ca8b. Closes: https://bugs.gentoo.org/966088 Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/tests/resolver/test_onlydeps_minimal.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/portage/tests/resolver/test_onlydeps_minimal.py b/lib/portage/tests/resolver/test_onlydeps_minimal.py index ffb1cf4ef8..ce15c7c6f2 100644 --- a/lib/portage/tests/resolver/test_onlydeps_minimal.py +++ b/lib/portage/tests/resolver/test_onlydeps_minimal.py @@ -1,8 +1,6 @@ # Copyright 2017-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -import pytest - from portage.tests import TestCase from portage.tests.resolver.ResolverPlayground import ( ResolverPlayground, @@ -12,7 +10,6 @@ from portage.tests.resolver.ResolverPlayground import ( class OnlydepsMinimalTestCase(TestCase): - @pytest.mark.xfail(reason="bug #966088") def testOnlydepsMinimal(self): ebuilds = { "dev-libs/A-1": { @@ -36,7 +33,7 @@ class OnlydepsMinimalTestCase(TestCase): success=True, options={"--onlydeps": True, "--onlydeps-with-rdeps": "y"}, ambiguous_merge_order=True, - mergelist=[("dev-libs/B-1", "dev-libs/C-1", "dev-libs/D-1")], + mergelist=[("dev-libs/B-1", "dev-libs/C-1", "dev-libs/D-1", "dev-libs/E-1")], ), ResolverPlaygroundTestCase( ["dev-libs/A"], @@ -55,7 +52,7 @@ class OnlydepsMinimalTestCase(TestCase): "--onlydeps-with-ideps": "y", }, ambiguous_merge_order=True, - mergelist=[("dev-libs/B-1",)], + mergelist=[("dev-libs/B-1", "dev-libs/E-1")], ), ResolverPlaygroundTestCase( ["dev-libs/A"],
