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 069B91389B4 for ; Tue, 12 Feb 2013 03:03:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 755FC21C00E; Tue, 12 Feb 2013 03:03:31 +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 1696021C00E for ; Tue, 12 Feb 2013 03:03:31 +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 F2D8D33E670 for ; Tue, 12 Feb 2013 03:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 77A7EE4073 for ; Tue, 12 Feb 2013 03:03:28 +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: <1360638196.8d53cd7227f6e0187a743b617746168ed28e895e.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_operator_unsolved.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8d53cd7227f6e0187a743b617746168ed28e895e X-VCS-Branch: master Date: Tue, 12 Feb 2013 03:03:28 +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: 70fded65-b25f-456e-a619-565500f4da8d X-Archives-Hash: 72100f6d70a69594e3a350b18441349b commit: 8d53cd7227f6e0187a743b617746168ed28e895e Author: Zac Medico gentoo org> AuthorDate: Tue Feb 12 03:03:16 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 12 03:03:16 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8d53cd72 SlotOperatorUnsolvedTestCase: add unwanted binpkg --- .../tests/resolver/test_slot_operator_unsolved.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pym/portage/tests/resolver/test_slot_operator_unsolved.py b/pym/portage/tests/resolver/test_slot_operator_unsolved.py index 7ae3d9e..c19783d 100644 --- a/pym/portage/tests/resolver/test_slot_operator_unsolved.py +++ b/pym/portage/tests/resolver/test_slot_operator_unsolved.py @@ -37,6 +37,14 @@ class SlotOperatorUnsolvedTestCase(TestCase): }, } + binpkgs = { + "net-libs/webkit-gtk-1.10.2-r300" : { + "EAPI": "5", + "DEPEND": ">=dev-libs/icu-3.8.1-r1:0/50=", + "RDEPEND": ">=dev-libs/icu-3.8.1-r1:0/50=" + }, + } + installed = { "dev-libs/icu-50.1.2" : { "EAPI": "5", @@ -59,7 +67,7 @@ class SlotOperatorUnsolvedTestCase(TestCase): ResolverPlaygroundTestCase( ["@world"], - options = {"--update": True, "--deep": True}, + options = {"--update": True, "--deep": True, "--usepkg": True}, circular_dependency_solutions = { 'dev-ruby/hoe-2.13.0': frozenset([frozenset([('test', False)])]), 'dev-ruby/rdoc-3.12.1': frozenset([frozenset([('test', False)])]) @@ -69,7 +77,7 @@ class SlotOperatorUnsolvedTestCase(TestCase): ) - playground = ResolverPlayground(ebuilds=ebuilds, + playground = ResolverPlayground(ebuilds=ebuilds, binpkgs=binpkgs, installed=installed, user_config=user_config, world=world, debug=False) try: