summaryrefslogtreecommitdiffstats
path: root/pym/portage/tests
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-20 11:01:43 -0700
committerZac Medico <zmedico@gentoo.org>2012-09-20 11:01:43 -0700
commite75364c99827641cd491206acfba4c6587cfcd33 (patch)
tree580bc00958b7baf88bc108e907d414d66fb7fa15 /pym/portage/tests
parent8ba939d53e52a88c183a2db95d1e51f04b0d9bb6 (diff)
downloadportage-e75364c99827641cd491206acfba4c6587cfcd33.tar.gz
portage-e75364c99827641cd491206acfba4c6587cfcd33.tar.bz2
portage-e75364c99827641cd491206acfba4c6587cfcd33.zip
Enable official EAPI 5 support.v2.2.0_alpha130
The council has officialy approved EAPI 5 in PMS: http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=99c78a51ff4c9737cdd399620072abdc14f8df11
Diffstat (limited to 'pym/portage/tests')
-rw-r--r--pym/portage/tests/repoman/test_simple.py4
-rw-r--r--pym/portage/tests/update/test_update_dbentry.py16
2 files changed, 10 insertions, 10 deletions
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py
index 639ec31ea..f29a177f0 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -79,7 +79,7 @@ class SimpleRepomanTestCase(TestCase):
)
profile = {
- "eapi": ("5_pre2",),
+ "eapi": ("5",),
"package.use.stable.mask": ("dev-libs/A flag",)
}
@@ -87,7 +87,7 @@ class SimpleRepomanTestCase(TestCase):
"dev-libs/A-0": {
"COPYRIGHT_HEADER" : copyright_header,
"DESCRIPTION" : "Desc goes here",
- "EAPI" : "5_pre2",
+ "EAPI" : "5",
"HOMEPAGE" : "http://example.com",
"IUSE" : "flag",
"KEYWORDS": "x86",
diff --git a/pym/portage/tests/update/test_update_dbentry.py b/pym/portage/tests/update/test_update_dbentry.py
index cb69053f7..ae634f031 100644
--- a/pym/portage/tests/update/test_update_dbentry.py
+++ b/pym/portage/tests/update/test_update_dbentry.py
@@ -27,16 +27,16 @@ class UpdateDbentryTestCase(TestCase):
(("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "2",
" dev-libs/A[foo] ", " dev-libs/B[foo] "),
- (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2",
+ (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5",
" dev-libs/A:0/1=[foo] ", " dev-libs/B:0/1=[foo] "),
- (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2",
+ (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5",
" dev-libs/A:0/1[foo] ", " dev-libs/B:0/1[foo] "),
- (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2",
+ (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5",
" dev-libs/A:0/0[foo] ", " dev-libs/B:0/0[foo] "),
- (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2",
+ (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5",
" dev-libs/A:0=[foo] ", " dev-libs/B:0=[foo] "),
(("slotmove", Atom("dev-libs/A"), "0", "1"), "1",
@@ -45,16 +45,16 @@ class UpdateDbentryTestCase(TestCase):
(("slotmove", Atom("dev-libs/A"), "0", "1"), "1",
" >=dev-libs/A-1:0 ", " >=dev-libs/A-1:1 "),
- (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2",
+ (("slotmove", Atom("dev-libs/A"), "0", "1"), "5",
" dev-libs/A:0/1=[foo] ", " dev-libs/A:1/1=[foo] "),
- (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2",
+ (("slotmove", Atom("dev-libs/A"), "0", "1"), "5",
" dev-libs/A:0/1[foo] ", " dev-libs/A:1/1[foo] "),
- (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2",
+ (("slotmove", Atom("dev-libs/A"), "0", "1"), "5",
" dev-libs/A:0/0[foo] ", " dev-libs/A:1/1[foo] "),
- (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2",
+ (("slotmove", Atom("dev-libs/A"), "0", "1"), "5",
" dev-libs/A:0=[foo] ", " dev-libs/A:1=[foo] "),
)
for update_cmd, eapi, input_str, output_str in cases: