summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-20 21:14:49 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-20 21:14:49 -0700
commit8f636333825fa8f134f1a1d84f7e054bbde571ee (patch)
tree1ee87a9328d42354ba33a2005f8b72437bd1a6b2
parent3f32a07536575e7dab97d4ab3e3233b09b3c2cdc (diff)
downloadportage-8f636333825fa8f134f1a1d84f7e054bbde571ee.tar.gz
portage-8f636333825fa8f134f1a1d84f7e054bbde571ee.tar.bz2
portage-8f636333825fa8f134f1a1d84f7e054bbde571ee.zip
ambigous_merge_order: handle more failure modes
-rw-r--r--pym/portage/tests/resolver/ResolverPlayground.py8
1 files changed, 8 insertions, 0 deletions
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: