[svn-commits] russell: branch pabelanger/sipp r1098 - /asterisk/team/pabelanger/sipp/lib/py...

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec  7 12:03:08 2010
New Revision: 1098

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1098
Log:
Make tests pass

Modified:
    asterisk/team/pabelanger/sipp/lib/python/sipp/version.py

Modified: asterisk/team/pabelanger/sipp/lib/python/sipp/version.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/lib/python/sipp/version.py?view=diff&rev=1098&r1=1097&r2=1098
==============================================================================
--- asterisk/team/pabelanger/sipp/lib/python/sipp/version.py (original)
+++ asterisk/team/pabelanger/sipp/lib/python/sipp/version.py Tue Dec  7 12:03:08 2010
@@ -61,9 +61,10 @@
             res = int(concept) * 10000000 + int(self.major) * 100000
             if self.minor is not None:
                 res += int(self.minor) * 1000
-
-            if self.tls is True and self.pcap is True:
-                res += 1000000000
+            if self.tls:
+                res += 100
+            if self.pcap:
+                res += 100
             return res
 
     def __cmp__(self, other):
@@ -205,7 +206,7 @@
     def test_cmp12(self):
         v1 = SIPpVersion("v3.2-TLS")
         v2 = SIPpVersion("v2.0.1-TLS-PCAP")
-        self.assertFalse(v1 > v2)
+        self.assertTrue(v1 > v2)
 
     def test_cmp13(self):
         v1 = SIPpVersion("v3.2-TLS")