From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9706B198005 for ; Mon, 4 Mar 2013 23:37:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21265E0102; Mon, 4 Mar 2013 23:37:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE4ACE0102 for ; Mon, 4 Mar 2013 23:37:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 938FC33DB8E for ; Mon, 4 Mar 2013 23:37:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2B23DE4073 for ; Mon, 4 Mar 2013 23:37:32 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1362440238.35b380891f4d142e77fc873368724c1d90c014e6.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_slot_abi.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 35b380891f4d142e77fc873368724c1d90c014e6 X-VCS-Branch: master Date: Mon, 4 Mar 2013 23:37:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dc921ca3-1c8b-4ada-a155-2d6ca1e46148 X-Archives-Hash: d4d946677d63a61a20d87abcadd7f01a commit: 35b380891f4d142e77fc873368724c1d90c014e6 Author: Zac Medico gentoo org> AuthorDate: Mon Mar 4 23:37:18 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Mar 4 23:37:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=35b38089 Add test for bug #460304. --- pym/portage/tests/resolver/test_slot_abi.py | 59 ++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/resolver/test_slot_abi.py b/pym/portage/tests/resolver/test_slot_abi.py index 8aed5d3..ca3662d 100644 --- a/pym/portage/tests/resolver/test_slot_abi.py +++ b/pym/portage/tests/resolver/test_slot_abi.py @@ -1,4 +1,4 @@ -# Copyright 2012 Gentoo Foundation +# Copyright 2012-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase @@ -247,6 +247,63 @@ class SlotAbiTestCase(TestCase): finally: playground.cleanup() + + def testWholeSlotConditional(self): + ebuilds = { + "dev-libs/libnl-3.2.14" : { + "SLOT": "3" + }, + "dev-libs/libnl-1.1-r3" : { + "SLOT": "1.1" + }, + "net-misc/networkmanager-0.9.6.4-r1" : { + "EAPI": "5", + "IUSE": "wimax", + "DEPEND": "wimax? ( dev-libs/libnl:1.1= ) !wimax? ( dev-libs/libnl:3= )", + "RDEPEND": "wimax? ( dev-libs/libnl:1.1= ) !wimax? ( dev-libs/libnl:3= )" + }, + } + installed = { + "dev-libs/libnl-1.1-r3" : { + "SLOT": "1.1" + }, + "net-misc/networkmanager-0.9.6.4-r1" : { + "EAPI": "5", + "IUSE": "wimax", + "USE": "wimax", + "DEPEND": "dev-libs/libnl:1.1/1.1=", + "RDEPEND": "dev-libs/libnl:1.1/1.1=" + }, + } + + user_config = { + "make.conf" : ("USE=\"wimax\"",) + } + + world = ["net-misc/networkmanager"] + + test_cases = ( + + # Demonstrate bug #460304, where _slot_operator_update_probe needs + # to account for USE conditional deps. + ResolverPlaygroundTestCase( + ["@world"], + options = {"--update": True, "--deep": True}, + success = True, + mergelist = ["net-misc/networkmanager-0.9.6.4-r1"]), + + ) + + playground = ResolverPlayground(ebuilds=ebuilds, + installed=installed, user_config=user_config, world=world, + debug=False) + try: + for test_case in test_cases: + playground.run_TestCase(test_case) + self.assertEqual(test_case.test_success, True, test_case.fail_msg) + finally: + playground.cleanup() + def testWholeSlotSubSlotMix(self): ebuilds = { "dev-libs/glib-1.2.10" : {