[asterisk-commits] pabelanger: branch pabelanger/sipp r1099 - in /asterisk/team/pabelanger/sipp:...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Dec 7 12:35:29 CST 2010


Author: pabelanger
Date: Tue Dec  7 12:35:25 2010
New Revision: 1099

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1099
Log:
Add logic to handle SIPp version for tests

Modified:
    asterisk/team/pabelanger/sipp/runtests.py
    asterisk/team/pabelanger/sipp/tests/cdr/app_dial_G_flag/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/cdr/app_queue/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/cdr/blind-transfer-accountcode/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/cdr/originate-cdr-disposition/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/queues/position_priority_maxlen/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/sip/options/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/sip_channel_params/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/sip_outbound_address/test-config.yaml
    asterisk/team/pabelanger/sipp/tests/sip_register/test-config.yaml

Modified: asterisk/team/pabelanger/sipp/runtests.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/runtests.py?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/runtests.py (original)
+++ asterisk/team/pabelanger/sipp/runtests.py Tue Dec  7 12:35:25 2010
@@ -21,6 +21,7 @@
 from asterisk.version import AsteriskVersion
 from asterisk.asterisk import Asterisk
 from asterisk import utils
+from sipp.version import SIPpVersion
 
 TESTS_CONFIG = "tests.yaml"
 TEST_RESULTS = "asterisk-test-suite-report.xml"
@@ -28,7 +29,9 @@
 class Dependency:
     def __init__(self, dep):
         self.name = ""
+        self.version = ""
         self.met = False
+        self.sipp_version = SIPpVersion()
         if "app" in dep:
             self.name = dep["app"]
             self.met = utils.which(self.name) is not None
@@ -39,6 +42,12 @@
                 self.met = True
             except ImportError:
                 pass
+        elif "sipp" in dep:
+            self.name = "SIPp"
+            self.version = SIPpVersion(dep["sipp"])
+            if (self.sipp_version > self.version):
+                self.met = True
+
         elif "custom" in dep:
             self.name = dep["custom"]
             method = "depend_%s" % self.name
@@ -266,7 +275,12 @@
                 print "      --> Maximum Version: %s (%s)" % \
                              (str(t.maxversion), str(t.maxversion_check))
             for d in t.deps:
-                print "      --> Dependency: %s -- Met: %s" % (d.name,
+                if d.version:
+                    print "      --> Dependency: %s" % (d.name)
+                    print "        --> Version: %s -- Met %s" % (d.version,
+                            str(d.met))
+                else:
+                    print "      --> Dependency: %s -- Met: %s" % (d.name,
                              str(d.met))
             i += 1
 

Modified: asterisk/team/pabelanger/sipp/tests/cdr/app_dial_G_flag/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/cdr/app_dial_G_flag/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/cdr/app_dial_G_flag/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/cdr/app_dial_G_flag/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -10,6 +10,5 @@
     minversion: '1.4'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
-
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/cdr/app_queue/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/cdr/app_queue/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/cdr/app_queue/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/cdr/app_queue/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -10,6 +10,5 @@
     minversion: '1.4'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
-
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/cdr/blind-transfer-accountcode/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/cdr/blind-transfer-accountcode/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/cdr/blind-transfer-accountcode/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/cdr/blind-transfer-accountcode/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -13,6 +13,5 @@
     minversion: '1.4'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
-
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/cdr/originate-cdr-disposition/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/cdr/originate-cdr-disposition/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/cdr/originate-cdr-disposition/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/cdr/originate-cdr-disposition/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -13,6 +13,5 @@
     minversion: '1.4'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
-
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/queues/position_priority_maxlen/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/queues/position_priority_maxlen/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/queues/position_priority_maxlen/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/queues/position_priority_maxlen/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -9,6 +9,5 @@
     minversion: '1.8'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
-
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/queues/ringinuse_and_pause/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -16,6 +16,5 @@
     minversion: '1.4'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
-
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/rfc2833_dtmf_detect/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -17,7 +17,7 @@
 
         Test 3: The first three DTMF digits contain no end frames. Asterisk
         should be able to properly handle the situation and still log the
-        DTMF presses.
+        DTMF presses."
     issues:
         - mantis : '15811'
 
@@ -25,5 +25,5 @@
     minversion: '1.4'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/sip/handle_response_refer/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -11,6 +11,5 @@
     minversion: '1.8'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
-
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/sip/options/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/sip/options/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/sip/options/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/sip/options/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -7,4 +7,4 @@
 properties:
     minversion: '1.4'
     dependencies:
-        - app : 'sipp'
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/sip_channel_params/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/sip_channel_params/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/sip_channel_params/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/sip_channel_params/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -18,5 +18,5 @@
     minversion: '1.8'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/sip_outbound_address/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/sip_outbound_address/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/sip_outbound_address/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/sip_outbound_address/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -18,5 +18,5 @@
     minversion: '1.8'
     dependencies:
         - app : 'bash'
-        - app : 'sipp'
         - app : 'asttest'
+        - sipp : 'v3.0'

Modified: asterisk/team/pabelanger/sipp/tests/sip_register/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/sipp/tests/sip_register/test-config.yaml?view=diff&rev=1099&r1=1098&r2=1099
==============================================================================
--- asterisk/team/pabelanger/sipp/tests/sip_register/test-config.yaml (original)
+++ asterisk/team/pabelanger/sipp/tests/sip_register/test-config.yaml Tue Dec  7 12:35:25 2010
@@ -9,5 +9,5 @@
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
-        - app : 'sipp'
         - custom : 'ipv6'
+        - sipp : 'v3.0'




More information about the asterisk-commits mailing list