test_merge_order: test asap PDEPEND (bug #180045)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 79898353715a0dac24267dfa4c0052d77a39863e..21d5c19528107d9a1a0f46a649b06ebe583825b5 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4633,6 +4633,7 @@ class depgraph(object):
                                                        continue
                                                if child in asap_nodes:
                                                        continue
+                                               # Merge PDEPEND asap for bug #180045.
                                                asap_nodes.append(child)
 
                        if selected_nodes and len(selected_nodes) > 1:

diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py
index ba3d9b47ef8ad221f515b747b83650e51e19228c..e00f820545732c13fcfb518ddb76ffbf37673a66 100644 (file)
--- a/pym/portage/tests/resolver/test_merge_order.py
+++ b/pym/portage/tests/resolver/test_merge_order.py
@@ -150,6 +150,26 @@ class MergeOrderTestCase(TestCase):
                        },
                        "app-arch/xz-utils-5.0.1" : {},
                        "app-arch/xz-utils-5.0.2" : {},
+                       "dev-util/pkgconfig-0.25-r2" : {},
+                       "kde-base/kdelibs-3.5.7" : {
+                               "PDEPEND" : "kde-misc/kdnssd-avahi",
+                       },
+                       "kde-misc/kdnssd-avahi-0.1.2" : {
+                               "DEPEND"  : "kde-base/kdelibs app-arch/xz-utils dev-util/pkgconfig",
+                               "RDEPEND" : "kde-base/kdelibs",
+                       },
+                       "kde-base/kdnssd-3.5.7" : {
+                               "DEPEND"  : "kde-base/kdelibs",
+                               "RDEPEND" : "kde-base/kdelibs",
+                       },
+                       "kde-base/libkdegames-3.5.7" : {
+                               "DEPEND"  : "kde-base/kdelibs",
+                               "RDEPEND" : "kde-base/kdelibs",
+                       },
+                       "kde-base/kmines-3.5.7" : {
+                               "DEPEND"  : "kde-base/libkdegames",
+                               "RDEPEND" : "kde-base/libkdegames",
+                       }
                }
 
                installed = {
@@ -342,6 +362,19 @@ class MergeOrderTestCase(TestCase):
                                all_permutations = True,
                                ambiguous_merge_order = True,
                                mergelist = ['sys-kernel/linux-headers-2.6.39', 'sys-devel/gcc-4.5.2', 'sys-libs/glibc-2.13', ('app-arch/xz-utils-5.0.2', 'sys-devel/binutils-2.20.1')]),
+                       # Test asap install of PDEPEND for bug #180045.
+                       ResolverPlaygroundTestCase(
+                               ["kde-base/kmines", "kde-base/kdnssd", "kde-base/kdelibs", "app-arch/xz-utils"],
+                               success = True,
+                               all_permutations = True,
+                               ambiguous_merge_order = True,
+                               merge_order_assertions = (
+                                       ('dev-util/pkgconfig-0.25-r2', 'kde-misc/kdnssd-avahi-0.1.2'),
+                                       ('kde-misc/kdnssd-avahi-0.1.2', 'kde-base/libkdegames-3.5.7'),
+                                       ('kde-misc/kdnssd-avahi-0.1.2', 'kde-base/kdnssd-3.5.7'),
+                                       ('kde-base/libkdegames-3.5.7', 'kde-base/kmines-3.5.7'),
+                               ),
+                               mergelist = [('kde-base/kdelibs-3.5.7', 'dev-util/pkgconfig-0.25-r2', 'kde-misc/kdnssd-avahi-0.1.2', 'app-arch/xz-utils-5.0.2', 'kde-base/libkdegames-3.5.7', 'kde-base/kdnssd-3.5.7', 'kde-base/kmines-3.5.7')]),
                )
 
                playground = ResolverPlayground(ebuilds=ebuilds, installed=installed)