From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DA582138010 for ; Wed, 26 Sep 2012 02:36:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5137421C004; Wed, 26 Sep 2012 02:36:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B54221C004 for ; Wed, 26 Sep 2012 02:36:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52FFF33D779 for ; Wed, 26 Sep 2012 02:36:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 03EF8E5446 for ; Wed, 26 Sep 2012 02:36:48 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1348626992.f337eed16b0f9995f6efd825a84a14f34b87adeb.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_targetroot.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f337eed16b0f9995f6efd825a84a14f34b87adeb X-VCS-Branch: master Date: Wed, 26 Sep 2012 02:36:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f7fe234b-eabb-4fa0-8768-0f394f5c7f5e X-Archives-Hash: 4bc854f2b4f6973cd30502f2b58ce3bc commit: f337eed16b0f9995f6efd825a84a14f34b87adeb Author: Zac Medico gentoo org> AuthorDate: Wed Sep 26 02:36:32 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Sep 26 02:36:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f337eed1 Test emerge --root-deps. --- pym/portage/tests/resolver/test_targetroot.py | 32 ++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/resolver/test_targetroot.py b/pym/portage/tests/resolver/test_targetroot.py index a79d231..118e6ce 100644 --- a/pym/portage/tests/resolver/test_targetroot.py +++ b/pym/portage/tests/resolver/test_targetroot.py @@ -12,7 +12,14 @@ class TargetRootTestCase(TestCase): "EAPI": "5-hdepend", "IUSE": "targetroot", "HDEPEND": "targetroot? ( ~dev-lang/python-3.2 )", - }, + }, + "dev-libs/A-1": { + "EAPI": "4", + "DEPEND": "dev-libs/B", + "RDEPEND": "dev-libs/C", + }, + "dev-libs/B-1": {}, + "dev-libs/C-1": {}, } test_cases = ( @@ -21,6 +28,29 @@ class TargetRootTestCase(TestCase): options = {}, success = True, mergelist = ["dev-lang/python-3.2", "dev-lang/python-3.2{targetroot}"]), + ResolverPlaygroundTestCase( + ["dev-lang/python"], + options = {"--root-deps": True}, + success = True, + mergelist = ["dev-lang/python-3.2", "dev-lang/python-3.2{targetroot}"]), + ResolverPlaygroundTestCase( + ["dev-libs/A"], + options = {}, + ambiguous_merge_order = True, + success = True, + mergelist = [("dev-libs/B-1", "dev-libs/C-1{targetroot}"), "dev-libs/A-1{targetroot}"]), + ResolverPlaygroundTestCase( + ["dev-libs/A"], + options = {"--root-deps": True}, + ambiguous_merge_order = True, + success = True, + mergelist = [("dev-libs/B-1{targetroot}", "dev-libs/C-1{targetroot}"), "dev-libs/A-1{targetroot}"]), + ResolverPlaygroundTestCase( + ["dev-libs/A"], + options = {"--root-deps": "rdeps"}, + ambiguous_merge_order = True, + success = True, + mergelist = [("dev-libs/C-1{targetroot}"), "dev-libs/A-1{targetroot}"]), ) playground = ResolverPlayground(ebuilds=ebuilds, targetroot=True,