From d7525a7e433ee77f7c94ab468ff66af4f2913684 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 12 May 2012 23:23:35 -0700 Subject: SimpleResolverTestCase: handle PYTHONHASHSEED --- pym/portage/tests/resolver/test_simple.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3-1-g7c22