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 1QNakw-0005Kj-4o for garchives@archives.gentoo.org; Sat, 21 May 2011 01:13:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B38B11C00A; Sat, 21 May 2011 01:13:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 733A01C00A for ; Sat, 21 May 2011 01:13: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 DDB5B1B400F for ; Sat, 21 May 2011 01:13:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EB3248001E for ; Sat, 21 May 2011 01:13:16 +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: 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 pym/portage/tests/resolver/test_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a3d40cef65ee8b0cef21e19c7e235ec5e36a58ea Date: Sat, 21 May 2011 01:13:16 +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: af97de60d46e465efefa2697529548ac commit: a3d40cef65ee8b0cef21e19c7e235ec5e36a58ea Author: Zac Medico gentoo org> AuthorDate: Sat May 21 01:11:56 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 01:11:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da3d40cef test_merge_order: fix ambigous_merge_order bug --- pym/portage/tests/resolver/ResolverPlayground.py | 7 +++++-- pym/portage/tests/resolver/test_merge_order.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/porta= ge/tests/resolver/ResolverPlayground.py index 5d1c1b3..298107c 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -536,8 +536,11 @@ class ResolverPlaygroundTestCase(object): got_token =3D got_stack.pop() expected_obj =3D expected_stack.pop() if isinstance(expected_obj, basestring): - new_expected.append(got_token) - continue + new_expected.append(expected_obj) + if got_token =3D=3D expected_obj: + continue + # result doesn't match, so stop early + break expected_obj =3D set(expected_obj) try: expected_obj.remove(got_token) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index 9c5d1fe..f51d14f 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -46,7 +46,7 @@ class MergeOrderTestCase(TestCase): # Test optimal merge order for a circular dep that is # RDEPEND in one direction and PDEPEND in the other. ResolverPlaygroundTestCase( - ["app-misc/some-app-a"], + ["app-misc/some-app-b"], success =3D True, ambigous_merge_order =3D True, mergelist =3D ["app-misc/circ-post-runtime-a-1", "app-misc/circ-post= -runtime-b-1", "app-misc/some-app-b-1"]),