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 1QNdOH-0006er-2b for garchives@archives.gentoo.org; Sat, 21 May 2011 04:02:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 193031C05D; Sat, 21 May 2011 04:02:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D896D1C053 for ; Sat, 21 May 2011 04:02:04 +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 59EEF1B4005 for ; Sat, 21 May 2011 04:02:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 61EF78001E for ; Sat, 21 May 2011 04:02:03 +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: <3f32a07536575e7dab97d4ab3e3233b09b3c2cdc.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_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3f32a07536575e7dab97d4ab3e3233b09b3c2cdc Date: Sat, 21 May 2011 04:02:03 +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: 311ef2e59b8b771e657f2ee3c234f47a commit: 3f32a07536575e7dab97d4ab3e3233b09b3c2cdc Author: Zac Medico gentoo org> AuthorDate: Sat May 21 04:01:31 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 04:01:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3f32a075 test_merge_order: test hard buildtime blockers --- pym/portage/tests/resolver/test_merge_order.py | 21 ++++++++++++++++++= +++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index e7f1aa4..45890af 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -10,6 +10,13 @@ class MergeOrderTestCase(TestCase): def testMergeOrder(self): ebuilds =3D { "app-misc/blocker-buildtime-a-1" : {}, + "app-misc/blocker-buildtime-unbuilt-a-1" : { + "DEPEND" : "!app-misc/installed-blocker-a", + }, + "app-misc/blocker-buildtime-unbuilt-hard-a-1" : { + "EAPI" : "2", + "DEPEND" : "!!app-misc/installed-blocker-a", + }, "app-misc/blocker-runtime-a-1" : {}, "app-misc/blocker-runtime-hard-a-1" : {}, "app-misc/circ-post-runtime-a-1": { @@ -75,6 +82,20 @@ class MergeOrderTestCase(TestCase): ["app-misc/blocker-runtime-a"], success =3D True, mergelist =3D ["app-misc/blocker-runtime-a-1", "app-misc/installed-b= locker-a-1", "!app-misc/blocker-runtime-a"]), + # We have a soft buildtime blocker against an installed + # package that should cause it to be uninstalled. + # TODO: distinguish between install/uninstall tasks in mergelist + ResolverPlaygroundTestCase( + ["app-misc/blocker-buildtime-unbuilt-a"], + success =3D True, + mergelist =3D ["app-misc/blocker-buildtime-unbuilt-a-1", "app-misc/i= nstalled-blocker-a-1", "!app-misc/installed-blocker-a"]), + # We have a hard buildtime blocker against an installed + # package that will not resolve automatically (unless + # the option requested in bug 250286 is implemented). + ResolverPlaygroundTestCase( + ["app-misc/blocker-buildtime-unbuilt-hard-a"], + success =3D False, + mergelist =3D ['app-misc/blocker-buildtime-unbuilt-hard-a-1', '!!app= -misc/installed-blocker-a']), # An installed package has a hard runtime blocker that # will not resolve automatically (unless the option # requested in bug 250286 is implemented).