From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QRBPv-0006w1-SU for garchives@archives.gentoo.org; Mon, 30 May 2011 22:58:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99C201C016; Mon, 30 May 2011 22:58:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 621D61C016 for ; Mon, 30 May 2011 22:58:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7B211B4025 for ; Mon, 30 May 2011 22:58:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CFA1880508 for ; Mon, 30 May 2011 22:58:25 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/test_merge_order.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fffbc6bc2a186bf0b09b791dcb260506875e66ce Date: Mon, 30 May 2011 22:58:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: be7f4e9ebe1732dd00bcdcaf963de512 commit: fffbc6bc2a186bf0b09b791dcb260506875e66ce Author: Zac Medico gentoo org> AuthorDate: Mon May 30 22:56:29 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon May 30 22:56:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfffbc6bc 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" : "|| ( >=3Dmedia-video/ffmpeg-0.6.90_rc0-r2 >=3Dmedia-vid= eo/libav-0.6.90_rc )", + }, } =20 installed =3D { @@ -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" : "|| ( >=3Dmedia-video/ffmpeg-0.6.90_rc0-r2 >=3Dmedia-vid= eo/libav-0.6.90_rc )", + }, } =20 test_cases =3D ( @@ -343,6 +354,15 @@ class MergeOrderTestCase(TestCase): ["app-misc/blocker-runtime-hard-a"], success =3D False, mergelist =3D ['app-misc/blocker-runtime-hard-a-1', '!!app-misc/bloc= ker-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=3DTrue, + mergelist =3D ['media-video/libav-0.7_pre20110327', 'media-video/ffm= peg-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.