From 7cfc6f9e05c6b847c923e17ec7c2e5429abff098 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 21 Oct 2010 12:58:44 -0700 Subject: [PATCH] Enable tests for resolver with EAPI 4. --- pym/portage/tests/resolver/test_eapi.py | 33 ++++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pym/portage/tests/resolver/test_eapi.py b/pym/portage/tests/resolver/test_eapi.py index 65dd0108b..88acad4c3 100644 --- a/pym/portage/tests/resolver/test_eapi.py +++ b/pym/portage/tests/resolver/test_eapi.py @@ -7,55 +7,58 @@ from portage.tests.resolver.ResolverPlayground import ResolverPlayground, Resolv class EAPITestCase(TestCase): def testEAPI(self): + + EAPI_4 = '4_pre1' + ebuilds = { #EAPI-1: IUSE-defaults "dev-libs/A-1.0": { "EAPI": 0, "IUSE": "+foo" }, "dev-libs/A-1.1": { "EAPI": 1, "IUSE": "+foo" }, "dev-libs/A-1.2": { "EAPI": 2, "IUSE": "+foo" }, "dev-libs/A-1.3": { "EAPI": 3, "IUSE": "+foo" }, - #~ "dev-libs/A-1.4": { "EAPI": 4, "IUSE": "+foo" }, + "dev-libs/A-1.4": { "EAPI": EAPI_4, "IUSE": "+foo" }, #EAPI-1: slot deps "dev-libs/A-2.0": { "EAPI": 0, "DEPEND": "dev-libs/B:0" }, "dev-libs/A-2.1": { "EAPI": 1, "DEPEND": "dev-libs/B:0" }, "dev-libs/A-2.2": { "EAPI": 2, "DEPEND": "dev-libs/B:0" }, "dev-libs/A-2.3": { "EAPI": 3, "DEPEND": "dev-libs/B:0" }, - #~ "dev-libs/A-2.4": { "EAPI": 4, "DEPEND": "dev-libs/B:0" }, + "dev-libs/A-2.4": { "EAPI": EAPI_4, "DEPEND": "dev-libs/B:0" }, #EAPI-2: use deps "dev-libs/A-3.0": { "EAPI": 0, "DEPEND": "dev-libs/B[foo]" }, "dev-libs/A-3.1": { "EAPI": 1, "DEPEND": "dev-libs/B[foo]" }, "dev-libs/A-3.2": { "EAPI": 2, "DEPEND": "dev-libs/B[foo]" }, "dev-libs/A-3.3": { "EAPI": 3, "DEPEND": "dev-libs/B[foo]" }, - #~ "dev-libs/A-3.4": { "EAPI": 4, "DEPEND": "dev-libs/B[foo]" }, + "dev-libs/A-3.4": { "EAPI": EAPI_4, "DEPEND": "dev-libs/B[foo]" }, #EAPI-2: strong blocks "dev-libs/A-4.0": { "EAPI": 0, "DEPEND": "!!dev-libs/B" }, "dev-libs/A-4.1": { "EAPI": 1, "DEPEND": "!!dev-libs/B" }, "dev-libs/A-4.2": { "EAPI": 2, "DEPEND": "!!dev-libs/B" }, "dev-libs/A-4.3": { "EAPI": 3, "DEPEND": "!!dev-libs/B" }, - #~ "dev-libs/A-4.4": { "EAPI": 4, "DEPEND": "!!dev-libs/B" }, + "dev-libs/A-4.4": { "EAPI": EAPI_4, "DEPEND": "!!dev-libs/B" }, #EAPI-4: slot operator deps - #~ "dev-libs/A-5.0": { "EAPI": 0, "DEPEND": "dev-libs/B:*" }, - #~ "dev-libs/A-5.1": { "EAPI": 1, "DEPEND": "dev-libs/B:*" }, - #~ "dev-libs/A-5.2": { "EAPI": 2, "DEPEND": "dev-libs/B:*" }, - #~ "dev-libs/A-5.3": { "EAPI": 3, "DEPEND": "dev-libs/B:*" }, - #~ "dev-libs/A-5.4": { "EAPI": 4, "DEPEND": "dev-libs/B:*" }, + "dev-libs/A-5.0": { "EAPI": 0, "DEPEND": "dev-libs/B:*" }, + "dev-libs/A-5.1": { "EAPI": 1, "DEPEND": "dev-libs/B:*" }, + "dev-libs/A-5.2": { "EAPI": 2, "DEPEND": "dev-libs/B:*" }, + "dev-libs/A-5.3": { "EAPI": 3, "DEPEND": "dev-libs/B:*" }, + "dev-libs/A-5.4": { "EAPI": EAPI_4, "DEPEND": "dev-libs/B:*" }, #EAPI-4: slot operator deps - #~ "dev-libs/A-6.0": { "EAPI": 0, "DEPEND": "dev-libs/B[bar(+)]" }, - #~ "dev-libs/A-6.1": { "EAPI": 1, "DEPEND": "dev-libs/B[bar(+)]" }, - #~ "dev-libs/A-6.2": { "EAPI": 2, "DEPEND": "dev-libs/B[bar(+)]" }, - #~ "dev-libs/A-6.3": { "EAPI": 3, "DEPEND": "dev-libs/B[bar(+)]" }, - #~ "dev-libs/A-6.4": { "EAPI": 4, "DEPEND": "dev-libs/B[bar(+)]" }, + "dev-libs/A-6.0": { "EAPI": 0, "DEPEND": "dev-libs/B[bar(+)]" }, + "dev-libs/A-6.1": { "EAPI": 1, "DEPEND": "dev-libs/B[bar(+)]" }, + "dev-libs/A-6.2": { "EAPI": 2, "DEPEND": "dev-libs/B[bar(+)]" }, + "dev-libs/A-6.3": { "EAPI": 3, "DEPEND": "dev-libs/B[bar(+)]" }, + "dev-libs/A-6.4": { "EAPI": EAPI_4, "DEPEND": "dev-libs/B[bar(+)]" }, #EAPI-4: REQUIRED_USE "dev-libs/A-7.0": { "EAPI": 0, "IUSE": "foo bar", "REQUIRED_USE": "|| ( foo bar )" }, "dev-libs/A-7.1": { "EAPI": 1, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, "dev-libs/A-7.2": { "EAPI": 2, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, "dev-libs/A-7.3": { "EAPI": 3, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, - #~ "dev-libs/A-7.4": { "EAPI": 4, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, + "dev-libs/A-7.4": { "EAPI": EAPI_4, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, "dev-libs/B-1": {"EAPI": 1, "IUSE": "+foo"}, } -- 2.26.2