tests: replace EAPI 4_pre1 with 4

diff --git a/pym/portage/tests/resolver/test_autounmask.py b/pym/portage/tests/resolver/test_autounmask.py
index d06b2fc30de50e32294b0dd1f2900c6967547f9e..e58a64375fd1539d5a5a28a8464a0809bb662e7e 100644 (file)
--- a/pym/portage/tests/resolver/test_autounmask.py
+++ b/pym/portage/tests/resolver/test_autounmask.py
@@ -8,8 +8,6 @@ class AutounmaskTestCase(TestCase):
 
        def testAutounmask(self):
 
-               EAPI_4 = '4_pre1'
-
                ebuilds = {
                        #ebuilds to test use changes
                        "dev-libs/A-1": { "SLOT": 1, "DEPEND": "dev-libs/B[foo]", "EAPI": 2}, 
@@ -46,9 +44,9 @@ class AutounmaskTestCase(TestCase):
 
                        #ebuilds to test interaction with REQUIRED_USE
                        "app-portage/A-1": { "DEPEND": "app-portage/B[foo]", "EAPI": 2 }, 
-                       "app-portage/A-2": { "DEPEND": "app-portage/B[foo=]", "IUSE": "+foo", "REQUIRED_USE": "foo", "EAPI": EAPI_4 }, 
+                       "app-portage/A-2": { "DEPEND": "app-portage/B[foo=]", "IUSE": "+foo", "REQUIRED_USE": "foo", "EAPI": "4" }, 
 
-                       "app-portage/B-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 }, 
+                       "app-portage/B-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": "4" }, 
                        }
 
                test_cases = (

diff --git a/pym/portage/tests/resolver/test_circular_dependencies.py b/pym/portage/tests/resolver/test_circular_dependencies.py
index 6eca63ea74607a7b0a123e3039d1a55dae5ed2c5..5132659276f2b7829cf9c303497be5b9a36c3c9a 100644 (file)
--- a/pym/portage/tests/resolver/test_circular_dependencies.py
+++ b/pym/portage/tests/resolver/test_circular_dependencies.py
@@ -17,8 +17,6 @@ class CircularDependencyTestCase(TestCase):
 
        def testCircularDependency(self):
 
-               EAPI_4 = '4_pre1'
-
                ebuilds = {
                        "dev-libs/Z-1": { "DEPEND": "foo? ( !bar? ( dev-libs/Y ) )", "IUSE": "+foo bar", "EAPI": 1 }, 
                        "dev-libs/Z-2": { "DEPEND": "foo? ( dev-libs/Y ) !bar? ( dev-libs/Y )", "IUSE": "+foo bar", "EAPI": 1 }, 
@@ -28,8 +26,8 @@ class CircularDependencyTestCase(TestCase):
                        "dev-libs/W-2": { "DEPEND": "dev-libs/Z[foo=] dev-libs/Y", "IUSE": "+foo", "EAPI": 2 },
                        "dev-libs/W-3": { "DEPEND": "dev-libs/Z[bar] dev-libs/Y", "EAPI": 2 },
 
-                       "app-misc/A-1": { "DEPEND": "foo? ( =app-misc/B-1 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 },
-                       "app-misc/A-2": { "DEPEND": "foo? ( =app-misc/B-2 ) bar? ( =app-misc/B-2 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 },
+                       "app-misc/A-1": { "DEPEND": "foo? ( =app-misc/B-1 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": "4" },
+                       "app-misc/A-2": { "DEPEND": "foo? ( =app-misc/B-2 ) bar? ( =app-misc/B-2 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": "4" },
                        "app-misc/B-1": { "DEPEND": "=app-misc/A-1" },
                        "app-misc/B-2": { "DEPEND": "=app-misc/A-2" },
                        }

diff --git a/pym/portage/tests/resolver/test_eapi.py b/pym/portage/tests/resolver/test_eapi.py
index 91f23d2bb815f6e1e7e2c528828f156e45cbd0bf..525b58532c014a6cd18dac087bffde1c31ffad02 100644 (file)
--- a/pym/portage/tests/resolver/test_eapi.py
+++ b/pym/portage/tests/resolver/test_eapi.py
@@ -8,57 +8,55 @@ 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": EAPI_4, "IUSE": "+foo" }, 
+                       "dev-libs/A-1.4": { "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": EAPI_4, "DEPEND": "dev-libs/B:0" }, 
+                       "dev-libs/A-2.4": { "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": EAPI_4, "DEPEND": "dev-libs/B[foo]" }, 
+                       "dev-libs/A-3.4": { "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": EAPI_4, "DEPEND": "!!dev-libs/B" }, 
+                       "dev-libs/A-4.4": { "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": EAPI_4, "DEPEND": "dev-libs/B:*" }, 
+                       #~ "dev-libs/A-5.4": { "EAPI": "4", "DEPEND": "dev-libs/B:*" }, 
 
                        #EAPI-4: use dep defaults
                        "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(+)]" }, 
+                       "dev-libs/A-6.4": { "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": EAPI_4, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, 
+                       "dev-libs/A-7.4": { "EAPI": "4", "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )" }, 
 
                        "dev-libs/B-1": {"EAPI": 1, "IUSE": "+foo"}, 
                        }

diff --git a/pym/portage/tests/resolver/test_required_use.py b/pym/portage/tests/resolver/test_required_use.py
index 1cfe2183ceae00e9c8401b2c1814450cf99ee2ed..cdff3ade6fd6231d350d7f3dd70a3a621dfbb7b3 100644 (file)
--- a/pym/portage/tests/resolver/test_required_use.py
+++ b/pym/portage/tests/resolver/test_required_use.py
@@ -10,20 +10,19 @@ class RequiredUSETestCase(TestCase):
                """
                Only simple REQUIRED_USE values here. The parser is tested under in dep/testCheckRequiredUse
                """
-               EAPI_4 = '4_pre1'
 
                ebuilds = {
-                       "dev-libs/A-1": {"EAPI": EAPI_4, "IUSE": "foo bar", "REQUIRED_USE": "|| ( foo bar )"},
-                       "dev-libs/A-2": {"EAPI": EAPI_4, "IUSE": "foo +bar", "REQUIRED_USE": "|| ( foo bar )"},
-                       "dev-libs/A-3": {"EAPI": EAPI_4, "IUSE": "+foo bar", "REQUIRED_USE": "|| ( foo bar )"},
-                       "dev-libs/A-4": {"EAPI": EAPI_4, "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( foo bar )"},
-                       "dev-libs/A-5": {"EAPI": EAPI_4, "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( )"},
+                       "dev-libs/A-1" : {"EAPI": "4", "IUSE": "foo bar",   "REQUIRED_USE": "|| ( foo bar )"},
+                       "dev-libs/A-2" : {"EAPI": "4", "IUSE": "foo +bar",  "REQUIRED_USE": "|| ( foo bar )"},
+                       "dev-libs/A-3" : {"EAPI": "4", "IUSE": "+foo bar",  "REQUIRED_USE": "|| ( foo bar )"},
+                       "dev-libs/A-4" : {"EAPI": "4", "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( foo bar )"},
+                       "dev-libs/A-5" : {"EAPI": "4", "IUSE": "+foo +bar", "REQUIRED_USE": "|| ( )"},
 
-                       "dev-libs/B-1": {"EAPI": EAPI_4, "IUSE": "foo bar", "REQUIRED_USE": "^^ ( foo bar )"},
-                       "dev-libs/B-2": {"EAPI": EAPI_4, "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )"},
-                       "dev-libs/B-3": {"EAPI": EAPI_4, "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )"},
-                       "dev-libs/B-4": {"EAPI": EAPI_4, "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( foo bar )"},
-                       "dev-libs/B-5": {"EAPI": EAPI_4, "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( )"},
+                       "dev-libs/B-1" : {"EAPI": "4", "IUSE": "foo bar",   "REQUIRED_USE": "^^ ( foo bar )"},
+                       "dev-libs/B-2" : {"EAPI": "4", "IUSE": "foo +bar",  "REQUIRED_USE": "^^ ( foo bar )"},
+                       "dev-libs/B-3" : {"EAPI": "4", "IUSE": "+foo bar",  "REQUIRED_USE": "^^ ( foo bar )"},
+                       "dev-libs/B-4" : {"EAPI": "4", "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( foo bar )"},
+                       "dev-libs/B-5" : {"EAPI": "4", "IUSE": "+foo +bar", "REQUIRED_USE": "^^ ( )"},
 
                        "dev-libs/C-1" : {"EAPI": "4", "IUSE": "+foo bar",  "REQUIRED_USE": "foo? ( !bar )"},
                        "dev-libs/C-2" : {"EAPI": "4", "IUSE": "+foo +bar", "REQUIRED_USE": "foo? ( !bar )"},

diff --git a/pym/portage/tests/resolver/test_slot_collisions.py b/pym/portage/tests/resolver/test_slot_collisions.py
index ad1ee65c6db2829ba877ea00aa17e8245b0123c8..6f61c6c31fdb71c02f3f853849d31486418c2b84 100644 (file)
--- a/pym/portage/tests/resolver/test_slot_collisions.py
+++ b/pym/portage/tests/resolver/test_slot_collisions.py
@@ -8,8 +8,6 @@ class SlotCollisionTestCase(TestCase):
 
        def testSlotCollision(self):
 
-               EAPI_4 = '4_pre1'
-
                ebuilds = {
                        "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo" }, 
                        "dev-libs/B-1": { "IUSE": "foo" },
@@ -29,7 +27,7 @@ class SlotCollisionTestCase(TestCase):
                        "sci-libs/L-1": { "DEPEND": "sci-libs/K[-foo]", "EAPI": 2 },
                        "sci-libs/M-1": { "DEPEND": "sci-libs/K[foo=]", "IUSE": "+foo", "EAPI": 2 },
 
-                       "app-misc/A-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 },
+                       "app-misc/A-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": "4" },
                        "app-misc/B-1": { "DEPEND": "=app-misc/A-1[foo=]", "IUSE": "foo", "EAPI": 2 },
                        "app-misc/C-1": { "DEPEND": "=app-misc/A-1[foo]", "EAPI": 2 },
                        "app-misc/E-1": { "RDEPEND": "dev-libs/E[foo?]", "IUSE": "foo", "EAPI": "2" },
@@ -44,7 +42,7 @@ class SlotCollisionTestCase(TestCase):
                        "sci-libs/K-1": { "IUSE": "foo", "USE": "" },
                        "sci-libs/L-1": { "DEPEND": "sci-libs/K[-foo]" },
 
-                       "app-misc/A-1": { "IUSE": "+foo bar", "USE": "foo", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 },
+                       "app-misc/A-1": { "IUSE": "+foo bar", "USE": "foo", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": "4" },
                        }
 
                test_cases = (

diff --git a/pym/portage/tests/resolver/test_use_dep_defaults.py b/pym/portage/tests/resolver/test_use_dep_defaults.py
index bc7bc25cc3e54ac57ba05bd52a312fea518c6e41..7d171066e246f685a64d341f7226d848047d86cc 100644 (file)
--- a/pym/portage/tests/resolver/test_use_dep_defaults.py
+++ b/pym/portage/tests/resolver/test_use_dep_defaults.py
@@ -8,12 +8,10 @@ class UseDepDefaultsTestCase(TestCase):
 
        def testUseDepDefaultse(self):
 
-               EAPI_4 = '4_pre1'
-
                ebuilds = {
                        "dev-libs/A-1": { "DEPEND": "dev-libs/B[foo]", "RDEPEND": "dev-libs/B[foo]", "EAPI": "2" },
-                       "dev-libs/A-2": { "DEPEND": "dev-libs/B[foo(+)]", "RDEPEND": "dev-libs/B[foo(+)]", "EAPI": EAPI_4 },
-                       "dev-libs/A-3": { "DEPEND": "dev-libs/B[foo(-)]", "RDEPEND": "dev-libs/B[foo(-)]", "EAPI": EAPI_4 },
+                       "dev-libs/A-2": { "DEPEND": "dev-libs/B[foo(+)]", "RDEPEND": "dev-libs/B[foo(+)]", "EAPI": "4" },
+                       "dev-libs/A-3": { "DEPEND": "dev-libs/B[foo(-)]", "RDEPEND": "dev-libs/B[foo(-)]", "EAPI": "4" },
                        "dev-libs/B-1": { "IUSE": "+foo", "EAPI": "1" },
                        "dev-libs/B-2": {},
                        }