[asterisk-commits] pabelanger: branch pabelanger/localhostBindaddr r919 - in /asterisk/team/pabe...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Nov 23 00:45:05 CST 2010
Author: pabelanger
Date: Tue Nov 23 00:45:00 2010
New Revision: 919
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=919
Log:
Update a few more tests.
Added:
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast1/
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast1/extensions.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/extensions.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast1/iax.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/iax.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast1/manager.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/manager.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast2/
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast2/extensions.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs2/extensions.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast2/features.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs2/features.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast2/iax.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs2/iax.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/ast2/manager.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs2/manager.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast1/
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast1/extensions.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs/extensions.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast1/iax.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs/iax.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast1/manager.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs/manager.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast2/
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast2/extensions.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs2/extensions.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast2/features.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs2/features.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast2/iax.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs2/iax.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/configs/ast2/manager.conf
- copied unchanged from r915, asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs2/manager.conf
Removed:
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/extensions.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/iax.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs/manager.conf
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/configs2/
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs/
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/blonde_configs2/
Modified:
asterisk/team/pabelanger/localhostBindaddr/tests/fax/local_channel_t38_queryoption/test.lua
asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/run-test
asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/run-test
Modified: asterisk/team/pabelanger/localhostBindaddr/tests/fax/local_channel_t38_queryoption/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/fax/local_channel_t38_queryoption/test.lua?view=diff&rev=919&r1=918&r2=919
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/fax/local_channel_t38_queryoption/test.lua (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/fax/local_channel_t38_queryoption/test.lua Tue Nov 23 00:45:00 2010
@@ -29,7 +29,7 @@
s["t38pt_udptl"] = "yes,none"
s["disallow"] = "all"
s["allow"] = "gsm"
-
+
s = c:new_section("fax")
s["type"] = "peer"
s["context"] = "local-receivefax"
@@ -45,10 +45,10 @@
s = c:new_section("receivefax")
s["exten"] = "1234,1,noop"
s["exten"] = "1234,n,ReceiveFax(receive.tiff)"
-
+
s["exten"] = "h,1,noop"
s["exten"] = "h,n,UserEvent(FaxStatus,application: ReceiveFax,status: ${FAXOPT(status)},statusstr: ${FAXOPT(statusstr)},error: ${FAXOPT(error)})"
-
+
s = c:new_section("local-receivefax")
s["exten"] = "1234,1,noop"
s["exten"] = "1234,n,Dial(local/1234 at receivefax)"
@@ -59,7 +59,7 @@
s["exten"] = "h,1,noop"
s["exten"] = "h,n,UserEvent(FaxStatus,application: SendFax,status: ${FAXOPT(status)},statusstr: ${FAXOPT(statusstr)},error: ${FAXOPT(error)})"
-
+
s = c:new_section("local-sendfax")
s["exten"] = "1234,1,noop"
s["exten"] = "1234,n,Dial(local/1234 at sendfax)"
Modified: asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/run-test?view=diff&rev=919&r1=918&r2=919
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/feature_attended_transfer/run-test Tue Nov 23 00:45:00 2010
@@ -18,6 +18,10 @@
sys.path.append("lib/python")
from asterisk.asterisk import Asterisk
from asterisk.version import AsteriskVersion
+
+workingdir = "/tmp/asterisk-testsuite/feature_attended_transfer"
+testdir = "tests/feature_attended_transfer"
+
class AttTransferTest:
def __init__(self, argv):
@@ -48,14 +52,13 @@
reactor.callWhenRunning(self.run)
- print self.ast_version
- self.asterisk1 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_attended_transfer"))
- self.asterisk1.install_configs("tests/feature_attended_transfer/configs")
+ self.ast1 = Asterisk(base=workingdir)
+ self.ast1.install_configs("%s/configs/ast1" % (testdir))
- self.asterisk2 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_attended_transfer"))
- self.asterisk2.install_configs("tests/feature_attended_transfer/configs2")
+ self.ast2 = Asterisk(base=workingdir)
+ self.ast2.install_configs("%s/configs/ast2" % (testdir))
- self.talkingaudio = os.path.join(os.getcwd(), "tests/feature_attended_transfer/sounds/talking")
+ self.talkingaudio = os.path.join(os.getcwd(), "%s/sounds/talking" % (testdir))
# Close out the agi
def handle_agi_result(self, agi, do_hangup):
@@ -86,21 +89,21 @@
def read_result(self):
if self.done == True:
- return # this means results were read earlier than the Time Out period
+ return # this means results were read earlier than the Time Out period
self.done = True
self.log_last_step("Reading results")
- self.asterisk1.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
- self.asterisk2.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
+ self.ast1.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
+ self.ast2.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
- self.asterisk1.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
- self.asterisk2.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 channels")# if channels are still up for some reason, we want to know that as well
+ self.ast2.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
if self.ast_version < AsteriskVersion("1.6.1"):
- self.asterisk1.cli_exec("core show globals") # The global variables here hold failure conditions
- self.asterisk2.cli_exec("core show globals") # The global variables here hold failure conditions
+ self.ast1.cli_exec("core show globals") # The global variables here hold failure conditions
+ self.ast2.cli_exec("core show globals") # The global variables here hold failure conditions
else:
- self.asterisk1.cli_exec("dialplan show globals") # The global variables here hold failure conditions
- self.asterisk2.cli_exec("dialplan show globals") # The global variables here hold failure conditions
+ self.ast1.cli_exec("dialplan show globals") # The global variables here hold failure conditions
+ self.ast2.cli_exec("dialplan show globals") # The global variables here hold failure conditions
self.stop_asterisk()
@@ -133,26 +136,26 @@
# 8. A and C report results to FastAGI and hangup.
def launch_test(self):
if self.ast_version < AsteriskVersion("1.6.1"):
- self.asterisk1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
- self.asterisk2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ self.ast2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
else:
- self.asterisk1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
- self.asterisk2.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
+ self.ast1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
+ self.ast2.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
self.log_last_step("Originating call to begin test 1")
if self.ast_version < AsteriskVersion("1.6.2"):
- self.asterisk2.cli_exec("originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
+ self.ast2.cli_exec("originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
else:
- self.asterisk2.cli_exec("channel originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
+ self.ast2.cli_exec("channel originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
def start_asterisk(self):
self.log_last_step("Starting Asterisk")
- self.asterisk1.start()
- self.asterisk2.start()
+ self.ast1.start()
+ self.ast2.start()
def stop_asterisk(self):
- self.asterisk1.stop()
- self.asterisk2.stop()
+ self.ast1.stop()
+ self.ast2.stop()
def log_last_step(self, step):
print step
Modified: asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/run-test?view=diff&rev=919&r1=918&r2=919
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/feature_blonde_transfer/run-test Tue Nov 23 00:45:00 2010
@@ -18,6 +18,9 @@
sys.path.append("lib/python")
from asterisk.asterisk import Asterisk
from asterisk.version import AsteriskVersion
+
+workingdir = "/tmp/asterisk-testsuite/feature_blonde_transfer"
+testdir = "tests/feature_blonde_transfer"
class BlondeTransferTest:
def __init__(self, argv):
@@ -44,14 +47,13 @@
reactor.callWhenRunning(self.run)
- print self.ast_version
- self.asterisk1 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_blonde_transfer"))
- self.asterisk1.install_configs("tests/feature_blonde_transfer/blonde_configs")
+ self.ast1 = Asterisk(base=workingdir)
+ self.ast1.install_configs("%s/configs/ast1" %s (testdir))
- self.asterisk2 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_blonde_transfer"))
- self.asterisk2.install_configs("tests/feature_blonde_transfer/blonde_configs2")
+ self.ast2 = Asterisk(base=workingdir)
+ self.ast2.install_configs("%s/configs/ast2" %s (testdir))
- self.talkingaudio = os.path.join(os.getcwd(), "tests/feature_blonde_transfer/sounds/talking")
+ self.talkingaudio = os.path.join(os.getcwd(), "%s/sounds/talking" % (testdir))
# Close out the agi
def handle_agi_result(self, agi):
@@ -74,18 +76,18 @@
def read_result(self):
self.log_last_step("Reading results")
- self.asterisk1.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
- self.asterisk2.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
+ self.ast1.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
+ self.ast2.cli_exec("core show locks") # get lock output in case of deadlock before tearing down.
- self.asterisk1.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
- self.asterisk2.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 channels")# if channels are still up for some reason, we want to know that as well
+ self.ast2.cli_exec("core show channels")# if channels are still up for some reason, we want to know that as well
if self.ast_version < AsteriskVersion("1.6.1"):
- self.asterisk1.cli_exec("core show globals") # The global variables here hold failure conditions
- self.asterisk2.cli_exec("core show globals") # The global variables here hold failure conditions
+ self.ast1.cli_exec("core show globals") # The global variables here hold failure conditions
+ self.ast2.cli_exec("core show globals") # The global variables here hold failure conditions
else:
- self.asterisk1.cli_exec("dialplan show globals") # The global variables here hold failure conditions
- self.asterisk2.cli_exec("dialplan show globals") # The global variables here hold failure conditions
+ self.ast1.cli_exec("dialplan show globals") # The global variables here hold failure conditions
+ self.ast2.cli_exec("dialplan show globals") # The global variables here hold failure conditions
self.stop_asterisk()
@@ -114,26 +116,26 @@
def launch_test(self):
if self.ast_version < AsteriskVersion("1.6.1"):
- self.asterisk1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
- self.asterisk2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ self.ast2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
else:
- self.asterisk1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
- self.asterisk2.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
+ self.ast1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
+ self.ast2.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
self.log_last_step("Originating call to begin test 1")
if self.ast_version < AsteriskVersion("1.6.2"):
- self.asterisk2.cli_exec("originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
+ self.ast2.cli_exec("originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
else:
- self.asterisk2.cli_exec("channel originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
+ self.ast2.cli_exec("channel originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
def start_asterisk(self):
self.log_last_step("Starting Asterisk")
- self.asterisk1.start()
- self.asterisk2.start()
+ self.ast1.start()
+ self.ast2.start()
def stop_asterisk(self):
- self.asterisk1.stop()
- self.asterisk2.stop()
+ self.ast1.stop()
+ self.ast2.stop()
def log_last_step(self, step):
print step
More information about the asterisk-commits
mailing list