From 8f636333825fa8f134f1a1d84f7e054bbde571ee Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 20 May 2011 21:14:49 -0700 Subject: ambigous_merge_order: handle more failure modes --- pym/portage/tests/resolver/ResolverPlayground.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pym') 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: -- cgit v1.2.3-1-g7c22