Signed-off-by: Aaron Bauman <b...@gentoo.org>
---
lib/portage/tests/resolver/test_eapi.py | 80 ++++++++++++-------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/lib/portage/tests/resolver/test_eapi.py
b/lib/portage/tests/resolver/test_eapi.py
index 50b9d90da..f8cf55b94 100644
--- a/lib/portage/tests/resolver/test_eapi.py
+++ b/lib/portage/tests/resolver/test_eapi.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2018 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from portage.tests import TestCase
@@ -10,58 +10,58 @@ class EAPITestCase(TestCase):
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.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" },
#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.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" },
#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.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]" },
#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.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" },
#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": "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": "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": "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.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/B-1": {"EAPI": 1, "IUSE": "+foo"},
+ "dev-libs/B-1": {"EAPI": 1, "IUSE": "+foo"},
#EAPI-7: implicit || ( ) no longer satisfies deps
- "dev-libs/C-1": { "EAPI": "6", "IUSE": "foo",
"RDEPEND": "|| ( foo? ( dev-libs/B ) )" },
+ "dev-libs/C-1": { "EAPI": "6", "IUSE": "foo",
"RDEPEND": "|| ( foo? ( dev-libs/B ) )" },
"dev-libs/C-2": { "EAPI": "7", "IUSE": "foo",
"RDEPEND": "|| ( foo? ( dev-libs/B ) )" },
}
@@ -102,7 +102,7 @@ class EAPITestCase(TestCase):
ResolverPlaygroundTestCase(["=dev-libs/A-6.2"], success
= False),
ResolverPlaygroundTestCase(["=dev-libs/A-6.3"], success
= False),
ResolverPlaygroundTestCase(["=dev-libs/A-6.4"], success
= True, mergelist = ["dev-libs/B-1", "dev-libs/A-6.4"]),
-
+
ResolverPlaygroundTestCase(["=dev-libs/A-7.0"], success
= False),
ResolverPlaygroundTestCase(["=dev-libs/A-7.1"], success
= False),
ResolverPlaygroundTestCase(["=dev-libs/A-7.2"], success
= False),
--
2.28.0
