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 1PoaEf-0006AG-Ux for garchives@archives.gentoo.org; Sun, 13 Feb 2011 11:35:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 166AD1C00A; Sun, 13 Feb 2011 11:35:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D33D11C00A for ; Sun, 13 Feb 2011 11:35:17 +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 654851B41B6 for ; Sun, 13 Feb 2011 11:35:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BEDF98006A for ; Sun, 13 Feb 2011 11:35: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/test_depth.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: cb23a2b4a53fb4847ca1c89492bed3fd7e408923 Date: Sun, 13 Feb 2011 11:35: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: 6420654b8b124119f3ac033f63bf1975 commit: cb23a2b4a53fb4847ca1c89492bed3fd7e408923 Author: Zac Medico gentoo org> AuthorDate: Sun Feb 13 11:34:32 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Feb 13 11:34:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dcb23a2b4 ResolverDepthTestCase: add more cases --- pym/portage/tests/resolver/test_depth.py | 31 ++++++++++++++++++++++++= ++++- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests= /resolver/test_depth.py index 5a30941..dc67005 100644 --- a/pym/portage/tests/resolver/test_depth.py +++ b/pym/portage/tests/resolver/test_depth.py @@ -24,6 +24,8 @@ class ResolverDepthTestCase(TestCase): "dev-libs/C-1": {}, } =20 + world =3D ["dev-libs/A"] + test_cases =3D ( ResolverPlaygroundTestCase( ["dev-libs/A"], @@ -39,12 +41,37 @@ class ResolverDepthTestCase(TestCase): =20 ResolverPlaygroundTestCase( ["dev-libs/A"], - options =3D {"--update": True, "--deep": 3}, + options =3D {"--update": True, "--deep": 2}, + success =3D True, + mergelist =3D ["dev-libs/C-2", "dev-libs/B-2", "dev-libs/A-2"]), + + ResolverPlaygroundTestCase( + ["@world"], + options =3D {"--update": True, "--deep": True}, + success =3D True, + mergelist =3D ["dev-libs/C-2", "dev-libs/B-2", "dev-libs/A-2"]), + + ResolverPlaygroundTestCase( + ["@world"], + options =3D {"--emptytree": True}, success =3D True, mergelist =3D ["dev-libs/C-2", "dev-libs/B-2", "dev-libs/A-2"]), + + ResolverPlaygroundTestCase( + ["@world"], + options =3D {"--selective": True, "--deep": True}, + success =3D True, + mergelist =3D []), + + ResolverPlaygroundTestCase( + ["dev-libs/A"], + options =3D {"--deep": 2}, + success =3D True, + mergelist =3D ["dev-libs/A-2"]), ) =20 - playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled) + playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled, + world=3Dworld) try: for test_case in test_cases: playground.run_TestCase(test_case)