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

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


Author: pabelanger
Date: Thu Nov 25 20:00:25 2010
New Revision: 963

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=963
Log:
More tests, MOAR!

Added:
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/configs/ast1/queues.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/configs/ast1/queues.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/ast1/modules.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/modules.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/ast1/queues.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/ast1/queues.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/ast1/
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/ast1/extensions.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/ast1/manager.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/ast1/sip.conf
      - copied unchanged from r961, asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/sip.conf
Removed:
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/modules.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/queues.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/configs/sip.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/manager.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/configs/sip.conf
Modified:
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/test.lua
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/run-test

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/test.lua?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/queues/macro_gosub_test/test.lua Thu Nov 25 20:00:25 2010
@@ -87,8 +87,8 @@
 end
 
 instance = ast.new()
-instance:load_config("configs/extensions.conf")
-instance:load_config("configs/queues.conf")
+instance:load_config("configs/ast1/extensions.conf")
+instance:load_config("configs/ast1/queues.conf")
 instance:generate_manager_conf()
 instance:spawn()
 

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/test.lua?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/queues/position_priority_maxlen/test.lua Thu Nov 25 20:00:25 2010
@@ -22,8 +22,8 @@
 
 function setup_ast_instance()
 	local instance = ast.new()
-	instance:load_config("configs/extensions.conf")
-	instance:load_config("configs/queues.conf")
+	instance:load_config("configs/ast1/extensions.conf")
+	instance:load_config("configs/ast1/queues.conf")
 	instance:generate_manager_conf()
 	instance:spawn()
 	return instance

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/test.lua?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/queues/queue_baseline/test.lua Thu Nov 25 20:00:25 2010
@@ -77,9 +77,9 @@
 end
 
 instance = ast.new()
-instance:load_config("configs/extensions.conf")
-instance:load_config("configs/queues.conf")
-instance:load_config("configs/modules.conf")
+instance:load_config("configs/ast1/extensions.conf")
+instance:load_config("configs/ast1/queues.conf")
+instance:load_config("configs/ast1/modules.conf")
 instance:generate_manager_conf()
 instance:spawn()
 

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/test.lua?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/queues/ringinuse_and_pause/test.lua Thu Nov 25 20:00:25 2010
@@ -50,9 +50,9 @@
 
 function setup_ast_instance()
 	local instance = ast.new()
-	instance:load_config("configs/extensions.conf")
-	instance:load_config("configs/queues.conf")
-	instance:load_config("configs/sip.conf")
+	instance:load_config("configs/ast1/extensions.conf")
+	instance:load_config("configs/ast1/queues.conf")
+	instance:load_config("configs/ast1/sip.conf")
 	instance:generate_manager_conf()
 	instance:spawn()
 	return instance

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/test.lua?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/rfc2833_dtmf_detect/test.lua Thu Nov 25 20:00:25 2010
@@ -86,8 +86,8 @@
 
 function do_dtmf_and_check_results(name)
 	local 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/handle_response_refer/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/test.lua?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip/handle_response_refer/test.lua Thu Nov 25 20:00:25 2010
@@ -1,7 +1,7 @@
 require "watcher"
 
 function sipp_exec(scenario, name, host, port)
-	host = host or "127.0.0.1" 
+	host = host or "127.0.0.1"
 	port = port or "5060"
 	local inf = "data.csv"
 	local p = proc.exec_io("sipp",
@@ -27,13 +27,13 @@
 end
 
 function sipp_check_error(p, scenario)
-	local res, err = p:wait()	
+	local res, err = p:wait()
 
 	if not res then error(err) end
-	if res ~= 0 then 
+	if res ~= 0 then
 		error("error while executing " .. scenario .. " sipp scenario (sipp exited with status " .. res .. ")\n" .. p.stderr:read("*a"))
 	end
-	
+
 	return res, err
 end
 
@@ -64,8 +64,8 @@
 	local action = ast.manager.action
 
 	local 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()
 
@@ -127,7 +127,7 @@
 	{"Testing response 603",
 		"sipp/wait-refer-603.xml",
 		"603", "FAILURE"},
-	
+
 	{"Testing response 202 with buggy notify",
 		"sipp/wait-refer-202-error.xml",
 		"202-err", "FAILURE"},

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/run-test?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer/run-test Thu Nov 25 20:00:25 2010
@@ -20,6 +20,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/sip_attended_transfer"
+testdir = "tests/sip_attended_transfer"
+
 class AttTransferTest:
     def __init__(self, argv):
         self.last_step = ""
@@ -35,13 +38,13 @@
         reactor.callWhenRunning(self.run)
 
         print self.ast_version
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/sip_attended_transfer")
-        self.asterisk.install_configs("tests/sip_attended_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:
@@ -109,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)
@@ -124,7 +127,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_attended_transfer_tcp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/run-test?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_tcp/run-test Thu Nov 25 20:00:25 2010
@@ -20,6 +20,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/sip_attended_transfer_tcp"
+testdir = "tests/sip_attended_transfer_tcp"
+
 class AttTransferTest:
     def __init__(self, argv):
         self.last_step = ""
@@ -35,13 +38,13 @@
         reactor.callWhenRunning(self.run)
 
         print self.ast_version
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/sip_attended_transfer_tcp")
-        self.asterisk.install_configs("tests/sip_attended_transfer_tcp/configs")
+        self.ast1 = Asterisk(base="workingdir")
+        self.ast1.install_configs("%s/configs/ast1")
 
     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:
@@ -109,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', '--no-udp'],
                                      stdin=subprocess.PIPE,
@@ -125,7 +128,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_attended_transfer_v6/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/run-test?view=diff&rev=963&r1=962&r2=963
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/sip_attended_transfer_v6/run-test Thu Nov 25 20:00:25 2010
@@ -21,6 +21,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/sip_attended_transfer_v6"
+testdir = "tests/sip_attended_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_attended_transfer_v6")
-        self.asterisk.install_configs("tests/sip_attended_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:
@@ -110,7 +112,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)
@@ -125,7 +127,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)




More information about the asterisk-commits mailing list