commit: 4afdceb32637346bba94fc47172133cdac64b101 Author: Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me> AuthorDate: Mon Mar 24 06:26:27 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Apr 12 19:49:58 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4afdceb3
tests: resolver: Reduce bug 951296 testcase Bug: https://bugs.gentoo.org/951296 Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me> Closes: https://github.com/gentoo/portage/pull/1432 Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/tests/resolver/test_bootstrap_deps.py | 37 ++++++++--------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/lib/portage/tests/resolver/test_bootstrap_deps.py b/lib/portage/tests/resolver/test_bootstrap_deps.py index 14fb274b5c..d208344c25 100644 --- a/lib/portage/tests/resolver/test_bootstrap_deps.py +++ b/lib/portage/tests/resolver/test_bootstrap_deps.py @@ -196,36 +196,25 @@ class BootstrapChainTestCase(TestCase): finally: playground.cleanup() - @pytest.mark.xfail(reason="bug #951296") def testBootstrapChainDisruptedShortcutWithShortcutLast(self): + self.__bootstrapChainDisruptedShortcutWithShortcutLastImpl( + "B? ( || ( dev-libs/A:4[B] =dev-libs/B-4 ) ) C? ( dev-libs/A:4[C] )", + ) + + @pytest.mark.xfail(reason="bug #951296") + def testBootstrapChainDisruptedShortcutWithShortcutLastAnyOf(self): + self.__bootstrapChainDisruptedShortcutWithShortcutLastImpl( + "B? ( || ( dev-libs/A:4[B] =dev-libs/B-4 ) ) C? ( || ( dev-libs/A:4[C] dev-libs/A:4[C] ) )", + ) + + def __bootstrapChainDisruptedShortcutWithShortcutLastImpl(self, bdepend): ebuilds = { - "dev-libs/A-1": { - "EAPI": "8", - "SLOT": "1", - "IUSE": "B", - "BDEPEND": "B? ( || ( dev-libs/A:1[B] <dev-libs/B-2 ) )", - }, - "dev-libs/A-2": { - "EAPI": "8", - "SLOT": "2", - "IUSE": "B C ", - "BDEPEND": "B? ( || ( dev-libs/A:2[B] <dev-libs/A-2[B] <dev-libs/B-3 ) ) C? ( || ( dev-libs/A:2[C(+)] <dev-libs/A-2[C(+)] <dev-libs/A-2[C(+)] ) )", - }, - "dev-libs/A-3": { - "EAPI": "8", - "SLOT": "3", - "IUSE": "B C", - "BDEPEND": "B? ( || ( dev-libs/A:3[B] <dev-libs/A-3[B] <dev-libs/B-4 ) ) C? ( || ( dev-libs/A:3[C(+)] <dev-libs/A-3[C(+)] <dev-libs/A-2[C(+)] ) )", - }, "dev-libs/A-4": { "EAPI": "8", "SLOT": "4", "IUSE": "B C", - "BDEPEND": "B? ( || ( dev-libs/A:4[B] <dev-libs/A-4[B] <dev-libs/B-5 ) ) C? ( || ( dev-libs/A:4[C(+)] <dev-libs/A-4[C(+)] <dev-libs/A-2[C(+)] ) )", + "BDEPEND": bdepend, }, - "dev-libs/B-1": {}, - "dev-libs/B-2": {}, - "dev-libs/B-3": {}, "dev-libs/B-4": {}, } @@ -234,7 +223,7 @@ class BootstrapChainTestCase(TestCase): "SLOT": "4", "IUSE": "B C", "USE": "C", - "BDEPEND": "B? ( || ( dev-libs/A:4[B] <dev-libs/A-4[B] <dev-libs/B-5 ) ) C? ( || ( dev-libs/A:4[C(+)] <dev-libs/A-4[C(+)] <dev-libs/A-2[C(+)] ) )", + "BDEPEND": bdepend, }, }
