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 1QOFmo-0000Jk-Jg for garchives@archives.gentoo.org; Sun, 22 May 2011 21:02:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A3C11C091; Sun, 22 May 2011 21:01:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 210481C091 for ; Sun, 22 May 2011 21:01:59 +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 8487D1B4022 for ; Sun, 22 May 2011 21:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D4B5F80506 for ; Sun, 22 May 2011 21:01:57 +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/test_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fabc1017c5d1c5273e63f0acf47d9589ff982d2d Date: Sun, 22 May 2011 21:01:57 +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: 4e0b8d5579835f18a1b6de53c164db26 commit: fabc1017c5d1c5273e63f0acf47d9589ff982d2d Author: Zac Medico gentoo org> AuthorDate: Sun May 22 21:01:18 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 22 21:01:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfabc1017 test_merge_order: test asap PORTAGE_PACKAGE_ATOM --- pym/portage/tests/resolver/test_merge_order.py | 22 ++++++++++++++++++= ++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index 105f869..2a4dbc3 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -1,6 +1,7 @@ # Copyright 2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 +import portage from portage.tests import TestCase from portage.tests.resolver.ResolverPlayground import (ResolverPlaygroun= d, ResolverPlaygroundTestCase) @@ -111,6 +112,16 @@ class MergeOrderTestCase(TestCase): "app-misc/some-app-c-1": { "RDEPEND": "app-misc/circ-buildtime-a app-misc/circ-buildtime-b", }, + "sys-apps/portage-2.1.9.42" : { + "DEPEND" : "dev-lang/python", + "RDEPEND" : "dev-lang/python", + }, + "sys-apps/portage-2.1.9.49" : { + "DEPEND" : "dev-lang/python", + "RDEPEND" : "dev-lang/python", + }, + "dev-lang/python-3.1" : {}, + "dev-lang/python-3.2" : {}, } =20 installed =3D { @@ -141,6 +152,11 @@ class MergeOrderTestCase(TestCase): "EAPI" : "2", "RDEPEND" : "!!app-misc/blocker-update-order-hard-unsolvable-a", }, + "sys-apps/portage-2.1.9.42" : { + "DEPEND" : "dev-lang/python", + "RDEPEND" : "dev-lang/python", + }, + "dev-lang/python-3.1" : {}, } =20 test_cases =3D ( @@ -263,6 +279,12 @@ class MergeOrderTestCase(TestCase): ["app-misc/blocker-runtime-hard-a"], success =3D False, mergelist =3D ['app-misc/blocker-runtime-hard-a-1', '!!app-misc/bloc= ker-runtime-hard-a']), + # Test that PORTAGE_PACKAGE_ATOM is merged asap. + ResolverPlaygroundTestCase( + ["dev-lang/python", portage.const.PORTAGE_PACKAGE_ATOM], + success =3D True, + all_permutations =3D True, + mergelist =3D ['sys-apps/portage-2.1.9.49', 'dev-lang/python-3.2']), ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled)