From: Alec Warner <antarus@gentoo.org>
Date: Thu, 1 Feb 2007 05:50:08 +0000 (-0000)
Subject: fix regression in test changes
X-Git-Tag: v2.2_pre1~1772
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=309deebb24acbf457e8470d834dda14080c76dd2;p=portage.git

fix regression in test changes

svn path=/main/trunk/; revision=5857
---

diff --git a/tests/portage/dep/test_dep_getcpv.py b/tests/portage/dep/test_dep_getcpv.py
index f1561ed78..11fd1a723 100644
--- a/tests/portage/dep/test_dep_getcpv.py
+++ b/tests/portage/dep/test_dep_getcpv.py
@@ -18,15 +18,24 @@ class DepGetCPV(TestCase):
 		bad_prefix_ops = [ ">~", "<~", "~>", "~<" ]
 		postfix_ops = [ "*", "" ]
 
-		cpvs = ["sys-apps/portage", "sys-apps/portage-2.1", "sys-apps/portage-2.1:",
-				"sys-apps/portage-2.1:2"]
-
+		cpvs = ["sys-apps/portage", "sys-apps/portage-2.1", "sys-apps/portage-2.1",
+				"sys-apps/portage-2.1"]
+		slots = [None,":",":2"]
 		for cpv in cpvs:
-			for prefix in prefix_ops:
-				for postfix in postfix_ops:
-					self.assertEqual( dep_getcpv( 
-						prefix + cpv + postfix ), cpv )
-			for prefix in bad_prefix_ops:
-				for postfix in postfix_ops:
-					self.assertNotEqual( dep_getcpv(
-						prefix + cpv + postfix ), cpv )
+			for slot in slots:
+				for prefix in prefix_ops:
+					for postfix in postfix_ops:
+						if slot:
+							self.assertEqual( dep_getcpv( 
+								prefix + cpv + slot + postfix ), cpv )
+						else:
+							self.assertEqual( dep_getcpv( 
+								prefix + cpv + postfix ), cpv )
+				for prefix in bad_prefix_ops:
+					for postfix in postfix_ops:
+						if slot:
+							self.assertNotEqual( dep_getcpv(
+								prefix + cpv + slot + postfix ), cpv )
+						else:
+							self.assertNotEqual( dep_getcpv(
+								prefix + cpv + postfix ), cpv )
\ No newline at end of file