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 1PofrT-0007Er-GA for garchives@archives.gentoo.org; Sun, 13 Feb 2011 17:35:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2EA9E07C3; Sun, 13 Feb 2011 17:35:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7CA54E07C3 for ; Sun, 13 Feb 2011 17:35:44 +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 F2B191B4077 for ; Sun, 13 Feb 2011 17:35:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 26F078006A for ; Sun, 13 Feb 2011 17:35:43 +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: <04da1ea51947b171f5994d0cc054769442d48cdf.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_depth.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 04da1ea51947b171f5994d0cc054769442d48cdf Date: Sun, 13 Feb 2011 17:35:43 +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: bb78b6bbb826b18b21ea1a14b7d9fd32 commit: 04da1ea51947b171f5994d0cc054769442d48cdf Author: Zac Medico gentoo org> AuthorDate: Sun Feb 13 17:35:07 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Feb 13 17:35:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D04da1ea5 ResolverDepthTestCase: add more cases --- pym/portage/tests/resolver/test_depth.py | 46 ++++++++++++++++++++++++= ++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests= /resolver/test_depth.py index 65cfac6..f070167 100644 --- a/pym/portage/tests/resolver/test_depth.py +++ b/pym/portage/tests/resolver/test_depth.py @@ -17,6 +17,15 @@ class ResolverDepthTestCase(TestCase): "dev-libs/C-1": {}, "dev-libs/C-2": {}, =20 + "virtual/libusb-0" : {"EAPI" :"2", "SLOT" : "0", "RDEPEND" : = "|| ( >=3Ddev-libs/libusb-0.1.12-r1:0 dev-libs/libusb-compat >=3Dsys-free= bsd/freebsd-lib-8.0[usb] )"}, + "virtual/libusb-1" : {"EAPI" :"2", "SLOT" : "1", "RDEPEND" : = ">=3Ddev-libs/libusb-1.0.4:1"}, + "dev-libs/libusb-0.1.13" : {}, + "dev-libs/libusb-1.0.5" : {"SLOT":"1"}, + "dev-libs/libusb-compat-1" : {}, + "sys-freebsd/freebsd-lib-8": {"IUSE" : "+usb"}, + + "sys-fs/udev-164" : {"EAPI" : "1", "RDEPEND" : "virtual/libu= sb:0"}, + "virtual/jre-1.5.0" : {"SLOT" : "1.5", "RDEPEND" : "|| ( =3Dde= v-java/sun-jre-bin-1.5.0* =3Dvirtual/jdk-1.5.0* )"}, "virtual/jre-1.5.0-r1" : {"SLOT" : "1.5", "RDEPEND" : "|| ( =3Dde= v-java/sun-jre-bin-1.5.0* =3Dvirtual/jdk-1.5.0* )"}, "virtual/jre-1.6.0" : {"SLOT" : "1.6", "RDEPEND" : "|| ( =3Dde= v-java/sun-jre-bin-1.6.0* =3Dvirtual/jdk-1.6.0* )"}, @@ -49,6 +58,8 @@ class ResolverDepthTestCase(TestCase): "virtual/jdk-1.6.0" : {"SLOT" : "1.6", "RDEPEND" : "|| ( =3Ddev= -java/icedtea-6* =3Ddev-java/sun-jdk-1.6.0* )"}, "dev-java/gcj-jdk-4.5" : {}, "dev-java/icedtea-6.1" : {}, + + "virtual/libusb-0" : {"EAPI" :"2", "SLOT" : "0", "RDEPEND" : = "|| ( >=3Ddev-libs/libusb-0.1.12-r1:0 dev-libs/libusb-compat >=3Dsys-free= bsd/freebsd-lib-8.0[usb] )"}, } =20 world =3D ["dev-libs/A"] @@ -175,6 +186,41 @@ class ResolverDepthTestCase(TestCase): options =3D {"--deep" : True}, success =3D True, mergelist =3D ["dev-db/hsqldb-1.8"]), + + # Pull in direct dep of virtual, even with --deep=3D0. + ResolverPlaygroundTestCase( + ["sys-fs/udev"], + options =3D {"--deep" : 0}, + success =3D True, + mergelist =3D ['dev-libs/libusb-0.1.13', 'sys-fs/udev-164']), + + # Test --nodeps with direct virtual deps. + ResolverPlaygroundTestCase( + ["sys-fs/udev"], + options =3D {"--nodeps" : True}, + success =3D True, + mergelist =3D ["sys-fs/udev-164"]), + + # Test that --nodeps overrides --deep. + ResolverPlaygroundTestCase( + ["sys-fs/udev"], + options =3D {"--nodeps" : True, "--deep" : True}, + success =3D True, + mergelist =3D ["sys-fs/udev-164"]), + + # Test that --nodeps overrides --emptytree. + ResolverPlaygroundTestCase( + ["sys-fs/udev"], + options =3D {"--nodeps" : True, "--emptytree" : True}, + success =3D True, + mergelist =3D ["sys-fs/udev-164"]), + + # Test --emptytree with virtuals. + ResolverPlaygroundTestCase( + ["sys-fs/udev"], + options =3D {"--emptytree" : True}, + success =3D True, + mergelist =3D ['dev-libs/libusb-0.1.13', 'virtual/libusb-0', 'sys-fs= /udev-164']), ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled,