From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 May 2011 04:14:49 +0000 (-0700)
Subject: ambigous_merge_order: handle more failure modes
X-Git-Tag: v2.2.0_alpha35~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f636333825fa8f134f1a1d84f7e054bbde571ee;p=portage.git

ambigous_merge_order: handle more failure modes
---

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 4f42b6743..2fc37dc47 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -566,6 +566,14 @@ class ResolverPlaygroundTestCase(object):
 						if not match:
 							# result doesn't match, so stop early
 							break
+						if expected_obj:
+							# result does not match, so stop early
+							new_expected.append(tuple(expected_obj))
+							break
+					if expected_stack:
+						# result does not match, add leftovers to new_expected
+						expected_stack.reverse()
+						new_expected.extend(expected_stack)
 					expected = new_expected
 
 			elif key in ("unstable_keywords", "needed_p_mask_changes") and expected is not None: