[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.

[Commits to the Asterisk SCF project code repositories]

branch "review" has been updated
       via  7e76eb1fbe88ee1ed211cdf4a1df98fce7157eeb (commit)
      from  61bf089ec9b671e8a79b3b1e81d1e6b8af68d0c7 (commit)

Summary of changes:
 plugins/asteriskscf_configurator.py                |    4 ++--
 plugins/sipp.py                                    |    8 ++++++--
 .../testcase.yaml                                  |   18 +++++++++++++++---
 tests/tests.yaml                                   |    2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit 7e76eb1fbe88ee1ed211cdf4a1df98fce7157eeb
Author: Darren Sessions <dsessions at digium.com>
Date:   Tue May 31 13:40:40 2011 -0500

    vistor class base class declaration name fix. some tweaks to the SIPp plugin.

diff --git a/plugins/asteriskscf_configurator.py b/plugins/asteriskscf_configurator.py
index ffc912f..7890cfa 100644
--- a/plugins/asteriskscf_configurator.py
+++ b/plugins/asteriskscf_configurator.py
@@ -213,7 +213,7 @@ class SectionVisitors():
         try:
             self.hosts[config[host]][config['ipv4oripv6']]
         except:
-            self.hosts[config[host]] = plugin().rpc(config[option])
+            self.hosts[config[host]] = plugin().rpc(config[host])
         if self.hosts[config[host]]['success'] == False:
             return self.hosts[config[host]]
         try:
@@ -390,7 +390,7 @@ class SipSectionVisitors(SectionVisitors):
         elif config['type'] == 'endpoint':
             return self.visit_endpoint(config, section)
 
-class RtpSectionVisitors(Configurator.SectionVisitors):
+class RtpSectionVisitors(SectionVisitors):
     def visit_general(self, config, section):
         mapper = Configurator.OptionMapper()
 
diff --git a/plugins/sipp.py b/plugins/sipp.py
index ae96b29..f6aec91 100644
--- a/plugins/sipp.py
+++ b/plugins/sipp.py
@@ -11,7 +11,7 @@
 
 import TestSuite
 
-class plugin(TestSuite.BaseClass):
+class plugin(TestSuite.RemoteBaseClass):
     def main(self, testData, testPath, rpc):
         config = {}
         modes = ['uas', 'uac']
@@ -27,7 +27,11 @@ class plugin(TestSuite.BaseClass):
    
         for mode in modes:
             if mode in config:
-                results = rpc.run('sipp', mode, self._componentConfig(mode, config[mode], testPath, rpc))
+                if mode == 'uas':
+                    waitForPidToFinish = False
+                if mode == 'uac':
+                    waitForPidToFinish = True
+                results = rpc.run('sipp', mode, self._componentConfig(mode, config[mode], testPath, rpc), waitForPidToFinish)
                 if results['success'] == False:
                     return results
 
diff --git a/tests/sip/SysTest_Functional_Basic_CallSetup/testcase.yaml b/tests/sip/SysTest_Functional_Basic_CallSetup/testcase.yaml
index a417161..b88c3f5 100644
--- a/tests/sip/SysTest_Functional_Basic_CallSetup/testcase.yaml
+++ b/tests/sip/SysTest_Functional_Basic_CallSetup/testcase.yaml
@@ -49,6 +49,18 @@ tests :
                             startport : 10000
                             endport : 20000
                             workerthreadcount : 4
-    - ipv6toipv6 :
-    - ipv4toipv6 :
-    - ipv6toipv4 :
+            - sipp:
+                testsuite_remote_host : testsuite-remote-2.digium.internal
+                cmd :
+                    - uas :
+                        transport : udp
+            - sipp:
+                testsuite_remote_host : testsuite-remote-3.digium.internal
+                cmd :
+                    - uac :
+                        calls : 10
+                        cps : 1
+                        duration : 10
+                        targethost : testsuite-remote-1.digium.internal
+                        ipv4oripv6 : ipv4
+                        transport : udp
diff --git a/tests/tests.yaml b/tests/tests.yaml
index e27a5e6..9e29cbc 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,4 +1,4 @@
 tests :
-#    - build
+    - build
     - sip
 #    - failover

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/testsuite.git