From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 26 Oct 2012 17:24:37 +0000 (-0700)
Subject: test_slot_conflict_rebuild: add a valid rebuild
X-Git-Tag: v2.2.0_alpha142~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94cfbc7023f89905f03e9f87563133fa2530c30e;p=portage.git

test_slot_conflict_rebuild: add a valid rebuild
---

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"]),
 
 		)