Fix poor assumptions.
authorZac Medico <zmedico@gentoo.org>
Sat, 12 Sep 2009 15:17:08 +0000 (15:17 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 12 Sep 2009 15:17:08 +0000 (15:17 -0000)
svn path=/main/trunk/; revision=14228

pym/portage/tests/dep/test_get_operator.py

index f93c2776f8d2106a4e8cbca44eab7f7c57127d82..fec6223a533a3bdd868980aba70a8952b5d75ed8 100644 (file)
@@ -12,11 +12,10 @@ class GetOperator(TestCase):
 
                # get_operator does not validate operators
                tests = [ ( "~", "~" ), ( "=", "=" ), ( ">", ">" ),
-                         ( ">=", ">=" ), ( "<=", "<=" ) , ( "", None ),
-                         ( ">~", ">" ), ("~<", "~"), ( "=~", "=" ),
-                         ( "=>", "=" ), ("=<", "=") ]
+                         ( ">=", ">=" ), ( "<=", "<=" ),
+               ]
 
-               test_cpvs = ["sys-apps/portage","sys-apps/portage-2.1"]
+               test_cpvs = ["sys-apps/portage-2.1"]
                slots = [ None,"1","linux-2.5.6" ]
                for cpv in test_cpvs:
                        for test in tests:
@@ -25,7 +24,11 @@ class GetOperator(TestCase):
                                        if slot:
                                                atom += ":" + slot
                                        result = get_operator( test[0] + atom )
-                                       self.assertEqual( result, test[1] )
+                                       self.assertEqual( result, test[1],
+                                               msg="get_operator(%s) != %s" % (test[0] + atom, test[1]) )
 
-               result = get_operator( "=sys-apps/portage*" )
+               result = get_operator( "sys-apps/portage" )
+               self.assertEqual( result, None )
+
+               result = get_operator( "=sys-apps/portage-2.1*" )
                self.assertEqual( result , "=*" )