Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/
Date: Mon, 30 May 2011 22:58:36
Message-Id: fffbc6bc2a186bf0b09b791dcb260506875e66ce.zmedico@gentoo
1 commit: fffbc6bc2a186bf0b09b791dcb260506875e66ce
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 22:56:29 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 22:56:29 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fffbc6bc
7
8 test_merge_order: test bug #264434 with virtual
9
10 ---
11 pym/portage/tests/resolver/test_merge_order.py | 22 +++++++++++++++++++++-
12 1 files changed, 21 insertions(+), 1 deletions(-)
13
14 diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py
15 index e00f820..6aa19c0 100644
16 --- a/pym/portage/tests/resolver/test_merge_order.py
17 +++ b/pym/portage/tests/resolver/test_merge_order.py
18 @@ -169,7 +169,14 @@ class MergeOrderTestCase(TestCase):
19 "kde-base/kmines-3.5.7" : {
20 "DEPEND" : "kde-base/libkdegames",
21 "RDEPEND" : "kde-base/libkdegames",
22 - }
23 + },
24 + "media-video/ffmpeg-0.7_rc1" : {},
25 + "media-video/libav-0.7_pre20110327" : {
26 + "RDEPEND" : "!media-video/ffmpeg",
27 + },
28 + "virtual/ffmpeg-0.6.90" : {
29 + "RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2 >=media-video/libav-0.6.90_rc )",
30 + },
31 }
32
33 installed = {
34 @@ -221,6 +228,10 @@ class MergeOrderTestCase(TestCase):
35 "RDEPEND": "",
36 },
37 "app-arch/xz-utils-5.0.1" : {},
38 + "media-video/ffmpeg-0.7_rc1" : {},
39 + "virtual/ffmpeg-0.6.90" : {
40 + "RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2 >=media-video/libav-0.6.90_rc )",
41 + },
42 }
43
44 test_cases = (
45 @@ -343,6 +354,15 @@ class MergeOrderTestCase(TestCase):
46 ["app-misc/blocker-runtime-hard-a"],
47 success = False,
48 mergelist = ['app-misc/blocker-runtime-hard-a-1', '!!app-misc/blocker-runtime-hard-a']),
49 + # Test swapping of providers for a new-style virtual package,
50 + # which relies on delayed evaluation of disjunctive (virtual
51 + # and ||) deps as required to solve bug #264434. Note that
52 + # this behavior is not suppored for old-style PROVIDE virtuals,
53 + # as reported in bug #339164.
54 + ResolverPlaygroundTestCase(
55 + ["media-video/libav"],
56 + success=True,
57 + mergelist = ['media-video/libav-0.7_pre20110327', 'media-video/ffmpeg-0.7_rc1', '!media-video/ffmpeg']),
58 # Test that PORTAGE_PACKAGE_ATOM is merged asap. Optimally,
59 # satisfied deps are always merged after the asap nodes that
60 # depend on them.