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 1QOFON-0006r3-Pk for garchives@archives.gentoo.org; Sun, 22 May 2011 20:36:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E84C91C044; Sun, 22 May 2011 20:36:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 998E61C044 for ; Sun, 22 May 2011 20:36:41 +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 AA9AB1B401D for ; Sun, 22 May 2011 20:36:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B74E880506 for ; Sun, 22 May 2011 20:36:39 +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: <652d1ff477c39c077c37ed249ed2d0f4fcbc75af.zmedico@gentoo> 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: 652d1ff477c39c077c37ed249ed2d0f4fcbc75af Date: Sun, 22 May 2011 20:36:39 +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: fb230279b8cd484b18c884c3b768a7aa commit: 652d1ff477c39c077c37ed249ed2d0f4fcbc75af Author: Zac Medico gentoo org> AuthorDate: Sun May 22 20:36:18 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 22 20:36:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D652d1ff4 test_merge_order: test case for bug 250286 --- pym/portage/tests/resolver/test_merge_order.py | 28 ++++++++++++++++++= ++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage= /tests/resolver/test_merge_order.py index 1904d5c..105f869 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -19,6 +19,7 @@ class MergeOrderTestCase(TestCase): }, "app-misc/blocker-update-order-a-1" : {}, "app-misc/blocker-update-order-hard-a-1" : {}, + "app-misc/blocker-update-order-hard-unsolvable-a-1" : {}, "app-misc/blocker-runtime-a-1" : {}, "app-misc/blocker-runtime-b-1" : {}, "app-misc/blocker-runtime-hard-a-1" : {}, @@ -93,6 +94,14 @@ class MergeOrderTestCase(TestCase): "RDEPEND" : "!!app-misc/blocker-update-order-hard-a", }, "app-misc/installed-old-version-blocks-hard-a-2" : {}, + "app-misc/installed-old-version-blocks-hard-unsolvable-a-1" : { + "EAPI" : "2", + "RDEPEND" : "!!app-misc/blocker-update-order-hard-unsolvable-a", + }, + "app-misc/installed-old-version-blocks-hard-unsolvable-a-2" : { + "DEPEND" : "app-misc/blocker-update-order-hard-unsolvable-a", + "RDEPEND" : "", + }, "app-misc/some-app-a-1": { "RDEPEND": "app-misc/circ-runtime-a app-misc/circ-runtime-b", }, @@ -128,6 +137,10 @@ class MergeOrderTestCase(TestCase): "EAPI" : "2", "RDEPEND" : "!!app-misc/blocker-update-order-hard-a", }, + "app-misc/installed-old-version-blocks-hard-unsolvable-a-1" : { + "EAPI" : "2", + "RDEPEND" : "!!app-misc/blocker-update-order-hard-unsolvable-a", + }, } =20 test_cases =3D ( @@ -200,6 +213,21 @@ class MergeOrderTestCase(TestCase): success =3D True, all_permutations =3D True, mergelist =3D ["app-misc/installed-old-version-blocks-hard-a-2", "ap= p-misc/blocker-update-order-hard-a-1"]), + # This is similar to the above case except that it's unsolvable + # due to merge order, unless bug 250286 is implemented so that + # the installed blocker will be unmerged before installation + # of the package it blocks (rather than after like a soft blocker + # would be handled). The "unmerge before" behavior requested + # in bug 250286 must be optional since essential programs or + # libraries may be temporarily unavailable during a + # non-overlapping update like this. + ResolverPlaygroundTestCase( + ["app-misc/blocker-update-order-hard-unsolvable-a", "app-misc/instal= led-old-version-blocks-hard-unsolvable-a"], + success =3D False, + all_permutations =3D True, + ambiguous_merge_order =3D True, + merge_order_assertions =3D (('app-misc/blocker-update-order-hard-uns= olvable-a-1', 'app-misc/installed-old-version-blocks-hard-unsolvable-a-2'= ),), + mergelist =3D [('app-misc/blocker-update-order-hard-unsolvable-a-1',= 'app-misc/installed-old-version-blocks-hard-unsolvable-a-2', '!!app-misc= /blocker-update-order-hard-unsolvable-a')]), # The installed package has runtime blockers that # should cause it to be uninstalled. The uninstall # task is executed only after blocking packages have