From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QNdbO-0008A1-BW for garchives@archives.gentoo.org; Sat, 21 May 2011 04:15:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31B5C1C00F; Sat, 21 May 2011 04:15:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 013321C00F for ; Sat, 21 May 2011 04:15:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 84B141B4011 for ; Sat, 21 May 2011 04:15:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8ABEE8001E for ; Sat, 21 May 2011 04:15:17 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <8f636333825fa8f134f1a1d84f7e054bbde571ee.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/ResolverPlayground.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8f636333825fa8f134f1a1d84f7e054bbde571ee Date: Sat, 21 May 2011 04:15:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5f6ec179158025ffe33e26101c7c3900 commit: 8f636333825fa8f134f1a1d84f7e054bbde571ee Author: Zac Medico gentoo org> AuthorDate: Sat May 21 04:14:49 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 04:14:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D8f636333 ambigous_merge_order: handle more failure modes --- pym/portage/tests/resolver/ResolverPlayground.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/porta= ge/tests/resolver/ResolverPlayground.py index 4f42b67..2fc37dc 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 =3D new_expected =20 elif key in ("unstable_keywords", "needed_p_mask_changes") and expect= ed is not None: