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 05BF11381F3 for ; Thu, 22 Aug 2013 00:46:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95559E0AC6; Thu, 22 Aug 2013 00:46:23 +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 11722E0AC6 for ; Thu, 22 Aug 2013 00:46:22 +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 EC1FD33EB8F for ; Thu, 22 Aug 2013 00:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9FBA4E468F for ; Thu, 22 Aug 2013 00:46:20 +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: <1377132339.fedb39bc9a2a9fd3ab37a08096cda6824c93b02a.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_autounmask_multilib_use.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fedb39bc9a2a9fd3ab37a08096cda6824c93b02a X-VCS-Branch: master Date: Thu, 22 Aug 2013 00:46:20 +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: c6c30065-c128-4748-a6e7-49eec607be42 X-Archives-Hash: 97e74c53db8620ed73156a95b9617493 commit: fedb39bc9a2a9fd3ab37a08096cda6824c93b02a Author: Zac Medico gentoo org> AuthorDate: Thu Aug 22 00:45:39 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 22 00:45:39 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fedb39bc Add test for bug #481628. --- .../tests/resolver/test_autounmask_multilib_use.py | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/pym/portage/tests/resolver/test_autounmask_multilib_use.py b/pym/portage/tests/resolver/test_autounmask_multilib_use.py new file mode 100644 index 0000000..e160c77 --- /dev/null +++ b/pym/portage/tests/resolver/test_autounmask_multilib_use.py @@ -0,0 +1,85 @@ +# Copyright 2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +from portage.tests import TestCase +from portage.tests.resolver.ResolverPlayground import (ResolverPlayground, + ResolverPlaygroundTestCase) + +class AutounmaskMultilibUseTestCase(TestCase): + + def testAutounmaskMultilibUse(self): + + self.todo = True + + ebuilds = { + "x11-proto/xextproto-7.2.1-r1": { + "EAPI": "5", + "IUSE": "abi_x86_32 abi_x86_64", + }, + "x11-libs/libXaw-1.0.11-r2": { + "EAPI": "5", + "IUSE": "abi_x86_32 abi_x86_64", + "RDEPEND": "x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?]" + }, + "app-emulation/emul-linux-x86-xlibs-20130224-r2": { + "EAPI": "5", + "RDEPEND": "x11-libs/libXaw[abi_x86_32]" + }, + "games-util/steam-client-meta-0-r20130514": { + "EAPI": "5", + "RDEPEND": "app-emulation/emul-linux-x86-xlibs" + } + } + + installed = { + "x11-proto/xextproto-7.2.1-r1": { + "EAPI": "5", + "IUSE": "abi_x86_32 abi_x86_64", + "USE": "abi_x86_32 abi_x86_64" + }, + "x11-libs/libXaw-1.0.11-r2": { + "EAPI": "5", + "IUSE": "abi_x86_32 abi_x86_64", + "RDEPEND": "x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?]", + "USE": "abi_x86_32 abi_x86_64" + }, + "app-emulation/emul-linux-x86-xlibs-20130224-r2": { + "EAPI": "5", + "RDEPEND": "x11-libs/libXaw[abi_x86_32]" + }, + "games-util/steam-client-meta-0-r20130514": { + "EAPI": "5", + "RDEPEND": "app-emulation/emul-linux-x86-xlibs" + } + } + + user_config = { + #"make.conf" : ("USE=\"abi_x86_32 abi_x86_64\"",) + "make.conf" : ("USE=\"abi_x86_64\"",) + } + + world = ("games-util/steam-client-meta",) + + test_cases = ( + + # Test autounmask solving of multilib use deps for bug #481628. + # We would like it to suggest some USE changes, but instead it + # currently fails with a SLOT conflict. + + ResolverPlaygroundTestCase( + ["x11-proto/xextproto", "x11-libs/libXaw"], + options = {"--oneshot": True, "--autounmask": True, + "--backtrack": 30}, + mergelist = ["x11-proto/xextproto-7.2.1-r1", "x11-libs/libXaw-1.0.11-r2"], + success = True), + ) + + 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()