diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-22 22:39:57 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-22 22:39:57 -0700 |
| commit | b84449fae4abf40ff3721002952dc37ccef24030 (patch) | |
| tree | 64cf8b867a97dbef9c77964b71697d31d5dbd9eb /pym/portage | |
| parent | 436a3cea2e56d57fdae788a4fdaf49438a10b4e5 (diff) | |
| download | portage-b84449fae4abf40ff3721002952dc37ccef24030.tar.gz portage-b84449fae4abf40ff3721002952dc37ccef24030.tar.bz2 portage-b84449fae4abf40ff3721002952dc37ccef24030.zip | |
_serialize_tasks: prefer unsatisfied asap child
Optimally, satisfied deps are always merged after the asap nodes that
depend on them.
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/tests/resolver/test_merge_order.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py index ee3c7863a..1057300d2 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -112,12 +112,13 @@ class MergeOrderTestCase(TestCase): "app-misc/some-app-c-1": { "RDEPEND": "app-misc/circ-buildtime-a app-misc/circ-buildtime-b", }, + "app-admin/eselect-python-20100321" : {}, "sys-apps/portage-2.1.9.42" : { "DEPEND" : "dev-lang/python", "RDEPEND" : "dev-lang/python", }, "sys-apps/portage-2.1.9.49" : { - "DEPEND" : "dev-lang/python", + "DEPEND" : "dev-lang/python >=app-admin/eselect-python-20091230", "RDEPEND" : "dev-lang/python", }, "dev-lang/python-3.1" : {}, @@ -318,12 +319,14 @@ class MergeOrderTestCase(TestCase): ["app-misc/blocker-runtime-hard-a"], success = False, mergelist = ['app-misc/blocker-runtime-hard-a-1', '!!app-misc/blocker-runtime-hard-a']), - # Test that PORTAGE_PACKAGE_ATOM is merged asap. + # Test that PORTAGE_PACKAGE_ATOM is merged asap. Optimally, + # satisfied deps are always merged after the asap nodes that + # depend on them. ResolverPlaygroundTestCase( ["dev-lang/python", portage.const.PORTAGE_PACKAGE_ATOM], success = True, all_permutations = True, - mergelist = ['sys-apps/portage-2.1.9.49', 'dev-lang/python-3.2']), + mergelist = ['app-admin/eselect-python-20100321', 'sys-apps/portage-2.1.9.49', 'dev-lang/python-3.2']), # Test that OS_HEADERS_PACKAGE_ATOM and LIBC_PACKAGE_ATOM # are merged asap, in order to account for implicit # dependencies. See bug #303567. |