diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-26 10:24:37 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-26 10:24:37 -0700 |
| commit | 94cfbc7023f89905f03e9f87563133fa2530c30e (patch) | |
| tree | ac1551678db0f9f4e83fc7a5617d6b0ed26a2e58 /pym/portage/tests | |
| parent | 3fcf296fdda7fa3f7c36d4d4c3ab55156fcd70fa (diff) | |
| download | portage-94cfbc7023f89905f03e9f87563133fa2530c30e.tar.gz portage-94cfbc7023f89905f03e9f87563133fa2530c30e.tar.bz2 portage-94cfbc7023f89905f03e9f87563133fa2530c30e.zip | |
test_slot_conflict_rebuild: add a valid rebuild
Diffstat (limited to 'pym/portage/tests')
| -rw-r--r-- | pym/portage/tests/resolver/test_slot_conflict_rebuild.py | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py index 5ce2329e1..3cd86bd32 100644 --- a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py +++ b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py @@ -33,6 +33,22 @@ class SlotConflictRebuildTestCase(TestCase): "RDEPEND": "<app-misc/A-2" }, + "app-misc/D-1" : { + "EAPI": "5", + "SLOT": "0/1" + }, + + "app-misc/D-2" : { + "EAPI": "5", + "SLOT": "0/2" + }, + + "app-misc/E-0" : { + "EAPI": "5", + "DEPEND": "app-misc/D:=", + "RDEPEND": "app-misc/D:=" + }, + } installed = { @@ -54,9 +70,20 @@ class SlotConflictRebuildTestCase(TestCase): "RDEPEND": "<app-misc/A-2" }, + "app-misc/D-1" : { + "EAPI": "5", + "SLOT": "0/1" + }, + + "app-misc/E-0" : { + "EAPI": "5", + "DEPEND": "app-misc/D:0/1=", + "RDEPEND": "app-misc/D:0/1=" + }, + } - world = ["app-misc/B", "app-misc/C"] + world = ["app-misc/B", "app-misc/C", "app-misc/E"] test_cases = ( @@ -66,7 +93,7 @@ class SlotConflictRebuildTestCase(TestCase): ["@world"], options = {"--update": True, "--deep": True}, success = True, - mergelist = []), + mergelist = ["app-misc/D-2", "app-misc/E-0"]), ) |