diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-27 10:19:36 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-27 10:19:36 -0700 |
| commit | bb112d9e0e0e9fb60cbe713887ab88454d5943fe (patch) | |
| tree | 74e3a2a64c446485420dbb11e5f86ce44dc8d418 /pym/portage/tests/resolver | |
| parent | 21ef745c11538e294f0946f2a40812971652b40c (diff) | |
| download | portage-bb112d9e0e0e9fb60cbe713887ab88454d5943fe.tar.gz portage-bb112d9e0e0e9fb60cbe713887ab88454d5943fe.tar.bz2 portage-bb112d9e0e0e9fb60cbe713887ab88454d5943fe.zip | |
slot_conflict_handler: handle slot_abi
We have to distinguish this from the "version" conflict, in order to
avoid invalid vercmp calls when there's not version.
Diffstat (limited to 'pym/portage/tests/resolver')
| -rw-r--r-- | pym/portage/tests/resolver/test_slot_collisions.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pym/portage/tests/resolver/test_slot_collisions.py b/pym/portage/tests/resolver/test_slot_collisions.py index 4867cea05..95d68fe04 100644 --- a/pym/portage/tests/resolver/test_slot_collisions.py +++ b/pym/portage/tests/resolver/test_slot_collisions.py @@ -45,6 +45,9 @@ class SlotCollisionTestCase(TestCase): "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" }, "app-misc/F-1": { "RDEPEND": "=dev-libs/E-1", "IUSE": "foo", "EAPI": "2" }, + + "dev-lang/perl-5.12": {"SLOT": "0/5.12", "EAPI": "4-slot-abi"}, + "dev-lang/perl-5.16": {"SLOT": "0/5.16", "EAPI": "4-slot-abi"}, } installed = { "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo", "USE": "foo" }, @@ -104,6 +107,15 @@ class SlotCollisionTestCase(TestCase): slot_collision_solutions = [] ), + # sub-slot + ResolverPlaygroundTestCase( + ["dev-lang/perl:0/5.12", "dev-lang/perl:0/5.16", "=dev-lang/perl-5.12*"], + success = False, + mergelist = ["dev-lang/perl-5.12", "dev-lang/perl-5.16"], + ignore_mergelist_order = True, + slot_collision_solutions = [] + ), + #Simple cases. ResolverPlaygroundTestCase( ["sci-libs/L", "sci-libs/M"], |