From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 May 2011 22:36:41 +0000 (-0700)
Subject: test_merge_order: fix bugs in previous commit
X-Git-Tag: v2.2.0_alpha35~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5933561be0ed3a6d46ba9608edff79bbeb8cd7f1;p=portage.git

test_merge_order: fix bugs in previous commit
---

diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py
index bae9bcadb..548f203fe 100644
--- a/pym/portage/tests/resolver/test_merge_order.py
+++ b/pym/portage/tests/resolver/test_merge_order.py
@@ -17,9 +17,7 @@ class MergeOrderTestCase(TestCase):
 				"EAPI"   : "2",
 				"DEPEND" : "!!app-misc/installed-blocker-a",
 			},
-			"app-misc/blocker-update-order-a-1" : {
-				"RDEPEND" : ">=app-misc/installed-old-version-blocks-a-2"
-			},
+			"app-misc/blocker-update-order-a-1" : {},
 			"app-misc/blocker-runtime-a-1" : {},
 			"app-misc/blocker-runtime-hard-a-1" : {},
 			"app-misc/circ-buildtime-a-0": {},
@@ -85,7 +83,7 @@ class MergeOrderTestCase(TestCase):
 				"RDEPEND" : "!app-misc/blocker-runtime-a !!app-misc/blocker-runtime-hard-a",
 			},
 			"app-misc/installed-old-version-blocks-a-1" : {
-				"RDEPEND" : "!app-misc/installed-old-version-blocks-a",
+				"RDEPEND" : "!app-misc/blocker-update-order-a",
 			},
 			"app-misc/installed-old-version-blocks-a-2" : {},
 			"app-misc/some-app-a-1": {
@@ -117,7 +115,7 @@ class MergeOrderTestCase(TestCase):
 				"RDEPEND" : "!app-misc/blocker-runtime-a !!app-misc/blocker-runtime-hard-a",
 			},
 			"app-misc/installed-old-version-blocks-a-1" : {
-				"RDEPEND" : "!app-misc/installed-old-version-blocks-a",
+				"RDEPEND" : "!app-misc/blocker-update-order-a",
 			},
 		}
 
@@ -179,8 +177,9 @@ class MergeOrderTestCase(TestCase):
 			# be updated first, in order to solve the blocker without
 			# any need for blocking packages to temporarily overlap.
 			ResolverPlaygroundTestCase(
-				["app-misc/blocker-update-order-a"],
+				["app-misc/blocker-update-order-a", "app-misc/installed-old-version-blocks-a"],
 				success = True,
+				all_permutations = True,
 				mergelist = ["app-misc/installed-old-version-blocks-a-2", "app-misc/blocker-update-order-a-1"]),
 			# installed package has runtime blocker that
 			# should cause it to be uninstalled