[gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/

["Zac Medico" <zmedico@gentoo.org>]

commit:     fffbc6bc2a186bf0b09b791dcb260506875e66ce
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 22:56:29 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 30 22:56:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fffbc6bc

test_merge_order: test bug #264434 with virtual

---
 pym/portage/tests/resolver/test_merge_order.py |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py
index e00f820..6aa19c0 100644
--- a/pym/portage/tests/resolver/test_merge_order.py
+++ b/pym/portage/tests/resolver/test_merge_order.py
@@ -169,7 +169,14 @@ class MergeOrderTestCase(TestCase):
 			"kde-base/kmines-3.5.7" : {
 				"DEPEND"  : "kde-base/libkdegames",
 				"RDEPEND" : "kde-base/libkdegames",
-			}
+			},
+			"media-video/ffmpeg-0.7_rc1" : {},
+			"media-video/libav-0.7_pre20110327" : {
+				"RDEPEND" : "!media-video/ffmpeg",
+			},
+			"virtual/ffmpeg-0.6.90" : {
+				"RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2 >=media-video/libav-0.6.90_rc )",
+			},
 		}
 
 		installed = {
@@ -221,6 +228,10 @@ class MergeOrderTestCase(TestCase):
 				"RDEPEND": "",
 			},
 			"app-arch/xz-utils-5.0.1" : {},
+			"media-video/ffmpeg-0.7_rc1" : {},
+			"virtual/ffmpeg-0.6.90" : {
+				"RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2 >=media-video/libav-0.6.90_rc )",
+			},
 		}
 
 		test_cases = (
@@ -343,6 +354,15 @@ 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 swapping of providers for a new-style virtual package,
+			# which relies on delayed evaluation of disjunctive (virtual
+			# and ||) deps as required to solve bug #264434. Note that
+			# this behavior is not suppored for old-style PROVIDE virtuals,
+			# as reported in bug #339164.
+			ResolverPlaygroundTestCase(
+				["media-video/libav"],
+				success=True,
+				mergelist = ['media-video/libav-0.7_pre20110327', 'media-video/ffmpeg-0.7_rc1', '!media-video/ffmpeg']),
 			# Test that PORTAGE_PACKAGE_ATOM is merged asap. Optimally,
 			# satisfied deps are always merged after the asap nodes that
 			# depend on them.