summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-20 21:01:31 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-20 21:01:31 -0700
commit3f32a07536575e7dab97d4ab3e3233b09b3c2cdc (patch)
treed7858f7cef1b2bf18cc1860b2ecad1f65b796bd9
parent037ef49ed8763eba774a8e69f9b060793cbb7d68 (diff)
downloadportage-3f32a07536575e7dab97d4ab3e3233b09b3c2cdc.tar.gz
portage-3f32a07536575e7dab97d4ab3e3233b09b3c2cdc.tar.bz2
portage-3f32a07536575e7dab97d4ab3e3233b09b3c2cdc.zip
test_merge_order: test hard buildtime blockers
-rw-r--r--pym/portage/tests/resolver/test_merge_order.py21
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 e7f1aa48c..45890af23 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 = {
"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 = True,
mergelist = ["app-misc/blocker-runtime-a-1", "app-misc/installed-blocker-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 = True,
+ mergelist = ["app-misc/blocker-buildtime-unbuilt-a-1", "app-misc/installed-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 = False,
+ mergelist = ['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).