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 <gentoo-commits+bounces-315934-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1PobZw-00072R-Py
for garchives@archives.gentoo.org; Sun, 13 Feb 2011 13:01:29 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 82730E08A6;
Sun, 13 Feb 2011 13:01:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 4321AE08A6
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 13:01:21 +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 ADAF61B4042
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 13:01:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 1BF008006A
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Feb 2011 13:01:20 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <47bd6967b23e94431e717d57588714f772a6309d.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: 47bd6967b23e94431e717d57588714f772a6309d
Date: Sun, 13 Feb 2011 13:01:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 856ce46ca0f22100d8744b83b927247f
commit: 47bd6967b23e94431e717d57588714f772a6309d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 13:00:28 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 13:00:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D47bd6967
ResolverDepthTestCase: test new-style virtuals
---
pym/portage/tests/resolver/test_depth.py | 90 ++++++++++++++++++++++++=
++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests=
/resolver/test_depth.py
index dc67005..cecdd37 100644
--- a/pym/portage/tests/resolver/test_depth.py
+++ b/pym/portage/tests/resolver/test_depth.py
@@ -16,12 +16,39 @@ class ResolverDepthTestCase(TestCase):
"dev-libs/B-2": {"RDEPEND" : "dev-libs/C"},
"dev-libs/C-1": {},
"dev-libs/C-2": {},
+
+ "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* )"},
+ "virtual/jre-1.6.0-r1" : {"SLOT" : "1.6", "RDEPEND" : "|| ( =3Dde=
v-java/sun-jre-bin-1.6.0* =3Dvirtual/jdk-1.6.0* )"},
+ "virtual/jdk-1.5.0" : {"SLOT" : "1.5", "RDEPEND" : "|| ( =3Dde=
v-java/sun-jdk-1.5.0* dev-java/gcj-jdk )"},
+ "virtual/jdk-1.5.0-r1" : {"SLOT" : "1.5", "RDEPEND" : "|| ( =3Dde=
v-java/sun-jdk-1.5.0* dev-java/gcj-jdk )"},
+ "virtual/jdk-1.6.0" : {"SLOT" : "1.6", "RDEPEND" : "|| ( =3Dde=
v-java/icedtea-6* =3Ddev-java/sun-jdk-1.6.0* )"},
+ "virtual/jdk-1.6.0-r1" : {"SLOT" : "1.6", "RDEPEND" : "|| ( =3Dde=
v-java/icedtea-6* =3Ddev-java/sun-jdk-1.6.0* )"},
+ "dev-java/gcj-jdk-4.5" : {},
+ "dev-java/gcj-jdk-4.5-r1" : {},
+ "dev-java/icedtea-6.1" : {},
+ "dev-java/icedtea-6.1-r1" : {},
+ "dev-java/sun-jdk-1.5" : {"SLOT" : "1.5"},
+ "dev-java/sun-jdk-1.6" : {"SLOT" : "1.6"},
+ "dev-java/sun-jre-bin-1.5" : {"SLOT" : "1.5"},
+ "dev-java/sun-jre-bin-1.6" : {"SLOT" : "1.6"},
+
+ "dev-java/ant-core-1.8" : {"DEPEND" : ">=3Dvirtual/jdk-1.4"},
+ "dev-db/hsqldb-1.8" : {"RDEPEND" : ">=3Dvirtual/jre-1.6"},
}
=20
installed =3D {
"dev-libs/A-1": {"RDEPEND" : "dev-libs/B"},
"dev-libs/B-1": {"RDEPEND" : "dev-libs/C"},
"dev-libs/C-1": {},
+
+ "virtual/jre-1.5.0" : {"SLOT" : "1.5", "RDEPEND" : "|| ( =3Dvir=
tual/jdk-1.5.0* =3Ddev-java/sun-jre-bin-1.5.0* )"},
+ "virtual/jre-1.6.0" : {"SLOT" : "1.6", "RDEPEND" : "|| ( =3Dvir=
tual/jdk-1.6.0* =3Ddev-java/sun-jre-bin-1.6.0* )"},
+ "virtual/jdk-1.5.0" : {"SLOT" : "1.5", "RDEPEND" : "|| ( =3Ddev=
-java/sun-jdk-1.5.0* dev-java/gcj-jdk )"},
+ "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" : {},
}
=20
world =3D ["dev-libs/A"]
@@ -68,6 +95,69 @@ class ResolverDepthTestCase(TestCase):
options =3D {"--deep": 2},
success =3D True,
mergelist =3D ["dev-libs/A-2"]),
+
+ ResolverPlaygroundTestCase(
+ ["virtual/jre"],
+ options =3D {},
+ success =3D True,
+ mergelist =3D ['virtual/jre-1.6.0-r1']),
+
+ ResolverPlaygroundTestCase(
+ ["virtual/jre"],
+ options =3D {"--deep" : True},
+ success =3D True,
+ mergelist =3D ['virtual/jre-1.6.0-r1']),
+
+ # Test bug #141118, where we avoid pulling in
+ # redundant deps, satisfying nested virtuals
+ # as efficiently as possible.
+ ResolverPlaygroundTestCase(
+ ["virtual/jre"],
+ options =3D {"--selective" : True, "--deep" : True},
+ success =3D True,
+ mergelist =3D []),
+
+ # Test bug #150361, where depgraph._greedy_slots()
+ # is triggered by --update with AtomArg.
+ ResolverPlaygroundTestCase(
+ ["virtual/jre"],
+ options =3D {"--update" : True},
+ success =3D True,
+ mergelist =3D ['dev-java/icedtea-6.1-r1', 'dev-java/gcj-jdk-4.5-r1',=
'virtual/jdk-1.6.0-r1', 'virtual/jdk-1.5.0-r1', 'virtual/jre-1.6.0-r1', =
'virtual/jre-1.5.0-r1']),
+
+ ResolverPlaygroundTestCase(
+ ["virtual/jre:1.5"],
+ options =3D {"--update" : True},
+ success =3D True,
+ mergelist =3D ['dev-java/gcj-jdk-4.5-r1', 'virtual/jdk-1.5.0-r1', 'v=
irtual/jre-1.5.0-r1']),
+
+ ResolverPlaygroundTestCase(
+ ["virtual/jre:1.6"],
+ options =3D {"--update" : True},
+ success =3D True,
+ mergelist =3D ['dev-java/icedtea-6.1-r1', 'virtual/jdk-1.6.0-r1', 'v=
irtual/jre-1.6.0-r1']),
+
+ # Test that we don't pull in any unnecessary updates
+ # when --update is not specified, even though we
+ # specified --deep.
+ ResolverPlaygroundTestCase(
+ ["dev-java/ant-core"],
+ options =3D {"--deep" : True},
+ success =3D True,
+ mergelist =3D ["dev-java/ant-core-1.8"]),
+
+ # FIXME: pulls in unwanted updates without --deep: ['dev-java/icedtea=
-6.1-r1', 'virtual/jdk-1.6.0-r1', 'dev-java/ant-core-1.8']
+ #ResolverPlaygroundTestCase(
+ # ["dev-java/ant-core"],
+ # options =3D {"--update" : True},
+ # success =3D True,
+ # mergelist =3D ["dev-java/ant-core-1.8"]),
+
+ ResolverPlaygroundTestCase(
+ ["dev-db/hsqldb"],
+ options =3D {"--deep" : True},
+ success =3D True,
+ mergelist =3D ["dev-db/hsqldb-1.8"]),
)
=20
playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta=
lled,