diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-22 15:01:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-25 21:20:47 -0700 |
| commit | 61ecd510191e27feeac191648df028c5c9cfd8ed (patch) | |
| tree | 73fb3c0962282fbc1cb4a822545f0ddb5b3eccc8 | |
| parent | 0c8c887c5e46bf5b7f337a7b2618042e9b444933 (diff) | |
| download | portage-61ecd510191e27feeac191648df028c5c9cfd8ed.tar.gz portage-61ecd510191e27feeac191648df028c5c9cfd8ed.tar.bz2 portage-61ecd510191e27feeac191648df028c5c9cfd8ed.zip | |
test_merge_order: test asap LIBC_PACKAGE_ATOM
| -rw-r--r-- | pym/portage/tests/resolver/test_merge_order.py | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py index 2a4dbc3d9..1b7cdddcd 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -122,6 +122,26 @@ class MergeOrderTestCase(TestCase): }, "dev-lang/python-3.1" : {}, "dev-lang/python-3.2" : {}, + "virtual/libc-0" : { + "RDEPEND" : "sys-libs/glibc", + }, + "sys-libs/glibc-2.11" : { + "DEPEND" : "virtual/os-headers", + }, + "sys-libs/glibc-2.13" : { + "DEPEND" : "virtual/os-headers", + }, + "virtual/os-headers-0" : { + "RDEPEND" : "sys-kernel/linux-headers", + }, + "sys-kernel/linux-headers-2.6.38": { + "DEPEND" : "app-arch/xz-utils", + }, + "sys-kernel/linux-headers-2.6.39": { + "DEPEND" : "app-arch/xz-utils", + }, + "app-arch/xz-utils-5.0.1" : {}, + "app-arch/xz-utils-5.0.2" : {}, } installed = { @@ -157,6 +177,19 @@ class MergeOrderTestCase(TestCase): "RDEPEND" : "dev-lang/python", }, "dev-lang/python-3.1" : {}, + "virtual/libc-0" : { + "RDEPEND" : "sys-libs/glibc", + }, + "sys-libs/glibc-2.11" : { + "DEPEND" : "virtual/os-headers", + }, + "virtual/os-headers-0" : { + "RDEPEND" : "sys-kernel/linux-headers", + }, + "sys-kernel/linux-headers-2.6.38": { + "DEPEND" : "app-arch/xz-utils", + }, + "app-arch/xz-utils-5.0.1" : {}, } test_cases = ( @@ -285,6 +318,17 @@ class MergeOrderTestCase(TestCase): success = True, all_permutations = True, mergelist = ['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. + # TODO: optimize this to ensure that glibc comes before xz-utils + ResolverPlaygroundTestCase( + ["app-arch/xz-utils", "sys-kernel/linux-headers", "sys-libs/glibc"], + options = {"--complete-graph" : True}, + success = True, + all_permutations = True, + ambiguous_merge_order = True, + mergelist = ['sys-kernel/linux-headers-2.6.39', ('app-arch/xz-utils-5.0.2', 'sys-libs/glibc-2.13')]), ) playground = ResolverPlayground(ebuilds=ebuilds, installed=installed) |