[asterisk-commits] pabelanger: branch pabelanger/localhostBindaddr r964 - in /asterisk/team/pabe...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Nov 25 20:14:06 CST 2010


Author: pabelanger
Date: Thu Nov 25 20:14:01 2010
New Revision: 964

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=964
Log:
Again, more updates.

Added:
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/ast1/rtp.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/rtp.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs1/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs1/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/ast2/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/ast2/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/ast2/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs2/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs/ast2/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs2/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs1/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs1/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/ast2/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/ast2/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/ast2/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs2/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs/ast2/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs2/sip.conf
Removed:
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/rtp.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs1/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/configs2/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs1/
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/configs2/
Modified:
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/run-test

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/test.lua?view=diff&rev=964&r1=963&r2=964
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_channel_params/test.lua Thu Nov 25 20:14:01 2010
@@ -127,10 +127,10 @@
 		["rtpsource,video"] = "127.0.0.1:1000[02]",
 		["rtpsource,text"] = ""
 	}
-	
-	a:load_config("configs/sip.conf")
-	a:load_config("configs/extensions.conf")
-	a:load_config("configs/rtp.conf")
+
+	a:load_config("configs/ast1/sip.conf")
+	a:load_config("configs/ast1/extensions.conf")
+	a:load_config("configs/ast1/rtp.conf")
 	a:generate_manager_conf()
 	a:spawn()
 

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/run-test?view=diff&rev=964&r1=963&r2=964
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer/run-test Thu Nov 25 20:14:01 2010
@@ -20,6 +20,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/sip_one_legged_transfer"
+testdir = "tests/sip_one_legged_transfer"
+
 class AttTransferTest:
     def __init__(self, argv):
         self.last_step = ""
@@ -34,14 +37,13 @@
 
         reactor.callWhenRunning(self.run)
 
-        print self.ast_version
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/sip_one_legged_transfer")
-        self.asterisk.install_configs("tests/sip_one_legged_transfer/configs")
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
     def readResult(self):
         self.logLastStep("Reading results")
-        self.asterisk.cli_exec("core show locks")   # get lock output in case of deadlock before tearing down.
-        self.asterisk.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
+        self.ast1.cli_exec("core show locks")   # get lock output in case of deadlock before tearing down.
+        self.ast1.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
         self.stopProcesses()
 
         if self.passed == True:
@@ -110,7 +112,7 @@
 
     def startProcesses(self):
         self.logLastStep("Starting Processes")
-        self.asterisk.start()
+        self.ast1.start()
         self.pja = subprocess.Popen(['pjsua', '--local-port=5065',
                                      '--auto-answer=200', '--null-audio'],
                                      stdin=subprocess.PIPE,
@@ -126,7 +128,7 @@
 
     def stopProcesses(self):
         self.logLastStep("Stopping Processes")
-        self.asterisk.stop()
+        self.ast.stop()
         os.kill(self.pja.pid, signal.SIGKILL)
         os.kill(self.pjb.pid, signal.SIGKILL)
         os.kill(self.pjc.pid, signal.SIGKILL)

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/run-test?view=diff&rev=964&r1=963&r2=964
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_one_legged_transfer_v6/run-test Thu Nov 25 20:14:01 2010
@@ -21,6 +21,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/sip_one_legged_transfer_v6"
+testdir = "tests/sip_one_legged_transfer_v6"
+
 class AttTransferTest:
     def __init__(self, argv):
         self.last_step = ""
@@ -35,14 +38,13 @@
 
         reactor.callWhenRunning(self.run)
 
-        print self.ast_version
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/sip_one_legged_transfer_v6")
-        self.asterisk.install_configs("tests/sip_one_legged_transfer_v6/configs")
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
     def readResult(self):
         self.logLastStep("Reading results")
-        self.asterisk.cli_exec("core show locks")   # get lock output in case of deadlock before tearing down.
-        self.asterisk.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
+        self.ast1.cli_exec("core show locks")   # get lock output in case of deadlock before tearing down.
+        self.ast1.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
         self.stopProcesses()
 
         if self.passed == True:
@@ -111,7 +113,7 @@
 
     def startProcesses(self):
         self.logLastStep("Starting Processes")
-        self.asterisk.start()
+        self.ast1.start()
         self.pja = subprocess.Popen(['pjsua', '--ipv6', '--local-port=5065',
                                      '--auto-answer=200', '--null-audio'],
                                      stdin=subprocess.PIPE,
@@ -127,7 +129,7 @@
 
     def stopProcesses(self):
         self.logLastStep("Stopping Processes")
-        self.asterisk.stop()
+        self.ast1.stop()
         os.kill(self.pja.pid, signal.SIGKILL)
         os.kill(self.pjb.pid, signal.SIGKILL)
         os.kill(self.pjc.pid, signal.SIGKILL)

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/test.lua?view=diff&rev=964&r1=963&r2=964
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_outbound_address/test.lua Thu Nov 25 20:14:01 2010
@@ -106,8 +106,8 @@
 end
 
 a = ast.new()
-a:load_config("configs/sip.conf")
-a:load_config("configs/extensions.conf")
+a:load_config("configs/ast1/sip.conf")
+a:load_config("configs/ast1/extensions.conf")
 a:generate_manager_conf()
 a:spawn()
 

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/run-test?view=diff&rev=964&r1=963&r2=964
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_register/run-test Thu Nov 25 20:14:01 2010
@@ -20,6 +20,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/sip_register"
+testdir = "tests/sip_register"
+
 class RegisterTest:
     def __init__(self, argv):
         self.last_step = ""
@@ -34,14 +37,12 @@
 
         reactor.callWhenRunning(self.run)
 
-        print self.ast_version
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/sip_register")
-        self.asterisk.install_config("tests/sip_register/configs/sip.conf")
-        self.asterisk.install_config("tests/sip_register/configs/manager.conf")
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")
-        self.asterisk.start()
+        self.ast1.start()
 
     def ami_on_connect(self, ami):
         self.log_last_step("Connected to the AMI")
@@ -85,7 +86,7 @@
 
     def shut_down(self):
         if not self.sipps:
-            self.asterisk.stop()
+            self.ast1.stop()
             return
 
         passing = True
@@ -98,7 +99,7 @@
                 print ("Registration failure for peer %s" % (peer))
             i['process'].terminate()
 
-        self.asterisk.stop()
+        self.ast1.stop()
 
         self.passed = passing
 

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/udptl/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/udptl/run-test?view=diff&rev=964&r1=963&r2=964
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/udptl/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/udptl/run-test Thu Nov 25 20:14:01 2010
@@ -19,6 +19,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/udptl"
+testdir = "tests/udptl"
+
 class UdptlTest:
     def __init__(self, argv):
         self.last_step = ""
@@ -32,18 +35,18 @@
 
         reactor.callWhenRunning(self.run)
 
-        print self.ast_version
-        self.asterisk1 = Asterisk(base="/tmp/asterisk-testsuite/udptl")
-        self.asterisk1.install_configs("tests/udptl/configs1")
-        self.asterisk2 = Asterisk(base="/tmp/asterisk-testsuite/udptl")
-        self.asterisk2.install_configs("tests/udptl/configs2")
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
+
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")
-        self.asterisk1.start()
-        self.asterisk1.cli_exec("fax set debug on")
-        self.asterisk2.start()
-        self.asterisk2.cli_exec("fax set debug on")
+        self.ast1.start()
+        self.ast1.cli_exec("fax set debug on")
+        self.ast2.start()
+        self.ast2.cli_exec("fax set debug on")
 
     def ami_on_connect1(self, ami):
         self.log_last_step("Connected to AMI 1")
@@ -88,8 +91,8 @@
         self.lastStep = step
 
     def shut_down(self):
-        self.asterisk1.stop()
-        self.asterisk2.stop()
+        self.ast1.stop()
+        self.ast2.stop()
 
         if self.passed:
             print "UDPTL test passed!"

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/run-test?view=diff&rev=964&r1=963&r2=964
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/udptl_v6/run-test Thu Nov 25 20:14:01 2010
@@ -19,6 +19,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/udptl_v6"
+testdir = "tests/udptl_v6"
+
 class UdptlTest:
     def __init__(self, argv):
         self.last_step = ""
@@ -32,18 +35,18 @@
 
         reactor.callWhenRunning(self.run)
 
-        print self.ast_version
-        self.asterisk1 = Asterisk(base="/tmp/asterisk-testsuite/udptl_v6")
-        self.asterisk1.install_configs("tests/udptl_v6/configs1")
-        self.asterisk2 = Asterisk(base="/tmp/asterisk-testsuite/udptl_v6")
-        self.asterisk2.install_configs("tests/udptl_v6/configs2")
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
+
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")
-        self.asterisk1.start()
-        self.asterisk1.cli_exec("fax set debug on")
-        self.asterisk2.start()
-        self.asterisk2.cli_exec("fax set debug on")
+        self.ast1.start()
+        self.ast1.cli_exec("fax set debug on")
+        self.ast2.start()
+        self.ast2.cli_exec("fax set debug on")
 
     def ami_on_connect1(self, ami):
         self.log_last_step("Connected to AMI 1")
@@ -88,8 +91,8 @@
         self.lastStep = step
 
     def shut_down(self):
-        self.asterisk1.stop()
-        self.asterisk2.stop()
+        self.ast1.stop()
+        self.ast2.stop()
 
         if self.passed:
             print "UDPTL test passed!"




More information about the asterisk-commits mailing list