From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-517610-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 7C62D138010
	for <garchives@archives.gentoo.org>; Fri, 26 Oct 2012 17:25:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CC8AAE0630;
	Fri, 26 Oct 2012 17:25:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 5EC3AE0630
	for <gentoo-commits@lists.gentoo.org>; Fri, 26 Oct 2012 17:25:19 +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 B8E9133D7A3
	for <gentoo-commits@lists.gentoo.org>; Fri, 26 Oct 2012 17:25:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 512E6E5436
	for <gentoo-commits@lists.gentoo.org>; Fri, 26 Oct 2012 17:25:17 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
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" <zmedico@gentoo.org>
Message-ID: <1351272277.94cfbc7023f89905f03e9f87563133fa2530c30e.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_conflict_rebuild.py
X-VCS-Directories: pym/portage/tests/resolver/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 94cfbc7023f89905f03e9f87563133fa2530c30e
X-VCS-Branch: master
Date: Fri, 26 Oct 2012 17:25:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1025064d-14c8-43f5-92b6-28f1e7a0a45d
X-Archives-Hash: d4c36416266a6f19fb433ebc010a7791

commit:     94cfbc7023f89905f03e9f87563133fa2530c30e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 17:24:37 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 17:24:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=94cfbc70

test_slot_conflict_rebuild: add a valid rebuild

---
 .../tests/resolver/test_slot_conflict_rebuild.py   |   31 ++++++++++++++++++-
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
index 5ce2329..3cd86bd 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
+++ b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
@@ -33,6 +33,22 @@ class SlotConflictRebuildTestCase(TestCase):
 				"RDEPEND": "<app-misc/A-2"
 			},
 
+			"app-misc/D-1" : {
+				"EAPI": "5",
+				"SLOT": "0/1"
+			},
+
+			"app-misc/D-2" : {
+				"EAPI": "5",
+				"SLOT": "0/2"
+			},
+
+			"app-misc/E-0" : {
+				"EAPI": "5",
+				"DEPEND": "app-misc/D:=",
+				"RDEPEND": "app-misc/D:="
+			},
+
 		}
 
 		installed = {
@@ -54,9 +70,20 @@ class SlotConflictRebuildTestCase(TestCase):
 				"RDEPEND": "<app-misc/A-2"
 			},
 
+			"app-misc/D-1" : {
+				"EAPI": "5",
+				"SLOT": "0/1"
+			},
+
+			"app-misc/E-0" : {
+				"EAPI": "5",
+				"DEPEND": "app-misc/D:0/1=",
+				"RDEPEND": "app-misc/D:0/1="
+			},
+
 		}
 
-		world = ["app-misc/B", "app-misc/C"]
+		world = ["app-misc/B", "app-misc/C", "app-misc/E"]
 
 		test_cases = (
 
@@ -66,7 +93,7 @@ class SlotConflictRebuildTestCase(TestCase):
 				["@world"],
 				options = {"--update": True, "--deep": True},
 				success = True,
-				mergelist = []),
+				mergelist = ["app-misc/D-2", "app-misc/E-0"]),
 
 		)