From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 13 May 2012 06:23:35 +0000 (-0700)
Subject: SimpleResolverTestCase: handle PYTHONHASHSEED
X-Git-Tag: v2.2.0_alpha105~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7525a7e433ee77f7c94ab468ff66af4f2913684;p=portage.git

SimpleResolverTestCase: handle PYTHONHASHSEED
---

diff --git a/pym/portage/tests/resolver/test_simple.py b/pym/portage/tests/resolver/test_simple.py
index 0bcfc4b70..4c2e97ef2 100644
--- a/pym/portage/tests/resolver/test_simple.py
+++ b/pym/portage/tests/resolver/test_simple.py
@@ -45,7 +45,8 @@ class SimpleResolverTestCase(TestCase):
 			ResolverPlaygroundTestCase(
 				["app-misc/Z"],
 				success = True,
-				mergelist = ["app-misc/W-1", "app-misc/X-1", "app-misc/Z-1"]),
+				ambiguous_merge_order = True,
+				mergelist = [("app-misc/W-1", "app-misc/X-1"), "app-misc/Z-1"]),
 			)
 
 		playground = ResolverPlayground(ebuilds=ebuilds, installed=installed)