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 1QNaZF-0004Ah-HA for garchives@archives.gentoo.org; Sat, 21 May 2011 01:01:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A97301C00B; Sat, 21 May 2011 01:01:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7D28C1C00B for ; Sat, 21 May 2011 01:01:13 +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 04E881B401D for ; Sat, 21 May 2011 01:01:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2476E8001E for ; Sat, 21 May 2011 01:01:12 +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: <50a1fcfffbc27df8dfec733a351fbbdee6d8db11.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/test_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 50a1fcfffbc27df8dfec733a351fbbdee6d8db11 Date: Sat, 21 May 2011 01:01:12 +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: e86f5cfa8bb0ce79c5bdcbd1d47be49d commit: 50a1fcfffbc27df8dfec733a351fbbdee6d8db11 Author: Zac Medico gentoo org> AuthorDate: Sat May 21 01:00:02 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 01:00:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D50a1fcff test_merge_order: test circular RDEPEND + PDEPEND --- pym/portage/tests/resolver/test_merge_order.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index ada9e73..9c5d1fe 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -9,6 +9,12 @@ class MergeOrderTestCase(TestCase): =20 def testMergeOrder(self): ebuilds =3D { + "app-misc/circ-post-runtime-a-1": { + "PDEPEND": "app-misc/circ-post-runtime-b", + }, + "app-misc/circ-post-runtime-b-1": { + "RDEPEND": "app-misc/circ-post-runtime-a", + }, "app-misc/circ-runtime-a-1": { "RDEPEND": "app-misc/circ-runtime-b", }, @@ -18,6 +24,9 @@ class MergeOrderTestCase(TestCase): "app-misc/some-app-a-1": { "RDEPEND": "app-misc/circ-runtime-a app-misc/circ-runtime-b", }, + "app-misc/some-app-b-1": { + "RDEPEND": "app-misc/circ-post-runtime-a app-misc/circ-post-runtime-= b", + }, } =20 installed =3D { @@ -34,6 +43,13 @@ class MergeOrderTestCase(TestCase): success =3D True, ambigous_merge_order =3D True, mergelist =3D [("app-misc/circ-runtime-b-1", "app-misc/circ-runtime-= a-1"), "app-misc/some-app-a-1"]), + # 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"], + 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"]), ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled)