Fix bad assumptions.

svn path=/main/trunk/; revision=14229

diff --git a/pym/portage/tests/dep/test_dep_getcpv.py b/pym/portage/tests/dep/test_dep_getcpv.py
index a49f4fa6be6be5df6c84b216852e2285dcad2958..893de0c6ec794f69ee7b835b3194fdbee0c1a272 100644 (file)
--- a/pym/portage/tests/dep/test_dep_getcpv.py
+++ b/pym/portage/tests/dep/test_dep_getcpv.py
@@ -12,30 +12,25 @@ class DepGetCPV(TestCase):
 
        def testDepGetCPV(self):
                
-               prefix_ops = ["<", ">", "=", "~", "!", "<=", 
-                             ">=", "!=", "!<", "!>", "!~",""]
+               prefix_ops = ["<", ">", "=", "~", "<=", 
+                             ">=", "!=", "!<", "!>", "!~"]
 
                bad_prefix_ops = [ ">~", "<~", "~>", "~<" ]
-               postfix_ops = [ "*", "" ]
+               postfix_ops = [ ("=", "*"), ]
 
-               cpvs = ["sys-apps/portage", "sys-apps/portage-2.1", "sys-apps/portage-2.1",
+               cpvs = ["sys-apps/portage-2.1", "sys-apps/portage-2.1",
                                "sys-apps/portage-2.1"]
-               slots = [None,":",":2"]
+               slots = [None, ":foo", ":2"]
                for cpv in cpvs:
                        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
+                                       mycpv = prefix + cpv
+                                       if slot:
+                                               mycpv += slot
+                                       self.assertEqual( dep_getcpv( mycpv ), cpv )
+
+                               for prefix, postfix in postfix_ops:
+                                       mycpv = prefix + cpv + postfix
+                                       if slot:
+                                               mycpv += slot
+                                       self.assertEqual( dep_getcpv( mycpv ), cpv )