From e9adefc7bdeff9287b62184cf68e9eeb156ef0a8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 20 May 2011 21:14:49 -0700 Subject: [PATCH] ambigous_merge_order: handle more failure modes --- pym/portage/tests/resolver/ResolverPlayground.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 667731b1b..5048b44e2 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -559,6 +559,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 == "unstable_keywords" and expected is not None: -- 2.26.2