[svn-commits] pabelanger: branch pabelanger/fastagi r1055 - in /asterisk/team/pabelanger/fa...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Dec 3 14:54:21 CST 2010
Author: pabelanger
Date: Fri Dec 3 14:54:17 2010
New Revision: 1055
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1055
Log:
Revert chanspy tests.
Modified:
asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_barge/run-test
asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_w_mixmonitor/run-test
Modified: asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_barge/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_barge/run-test?view=diff&rev=1055&r1=1054&r2=1055
==============================================================================
--- asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_barge/run-test Fri Dec 3 14:54:17 2010
@@ -68,7 +68,11 @@
self.logLastStep("Reading results")
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.ast1.cli_exec("core show globals") # The global variables here hold failure conditions
+
+ if self.ast_version < AsteriskVersion("1.6.1"):
+ self.ast1.cli_exec("core show globals") # The global variables here hold failure conditions
+ else:
+ self.ast1.cli_exec("dialplan show globals") # The global variables here hold failure conditions
if self.passed == True:
print 'SIP ChanSpy test PASSED!'
@@ -119,8 +123,12 @@
self.pja = subprocess.Popen(['pjsua', '--local-port=5065', '--auto-answer=200', '--null-audio', '--auto-loop'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
self.pjb = subprocess.Popen(['pjsua', '--local-port=5066', '--auto-answer=200', playfilearg, '--auto-play'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
- self.ast1.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
- self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ if self.ast_version < AsteriskVersion("1.6.1"):
+ self.ast1.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
+ self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ else:
+ self.ast1.cli_exec("dialplan set global TESTAUDIO1 " + self.audiofile1)
+ self.ast1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
def stopProcesses(self):
self.logLastStep("Stopping Processes")
@@ -134,10 +142,16 @@
def callChanSpy(self):
self.logLastStep("Placing call to ChanSpy extension.")
- self.ast1.cli_originate("SIP/end_b extension chanspytest at test")
+ if self.ast_version < AsteriskVersion("1.6.2"):
+ self.ast1.cli_exec("originate SIP/end_b extension chanspytest at test")
+ else:
+ self.ast1.cli_exec("channel originate SIP/end_b extension chanspytest at test")
def verifyAudio(self):
- self.ast1.cli_originate("Local/play_recording at test extension detect_audio at test")
+ if self.ast_version < AsteriskVersion("1.6.2"):
+ self.ast1.cli_exec("originate Local/play_recording at test extension detect_audio at test")
+ else:
+ self.ast1.cli_exec("channel originate Local/play_recording at test extension detect_audio at test")
def run(self):
Modified: asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_w_mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_w_mixmonitor/run-test?view=diff&rev=1055&r1=1054&r2=1055
==============================================================================
--- asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_w_mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/fastagi/tests/chanspy/chanspy_w_mixmonitor/run-test Fri Dec 3 14:54:17 2010
@@ -64,12 +64,17 @@
self.logLastStep("Reading results")
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.ast1.cli_exec("core show globals") # The global variables here hold failure conditions
+
+ if self.ast_version < AsteriskVersion("1.6.1"):
+ self.ast1.cli_exec("core show globals") # The global variables here hold failure conditions
+ else:
+ self.ast1.cli_exec("dialplan show globals") # The global variables here hold failure conditions
if self.passed == True:
print 'SIP ChanSpy test PASSED!'
else:
print 'SIP ChanSpy Test FAILED'
+
self.stopProcesses()
@@ -126,8 +131,12 @@
self.pjb = subprocess.Popen(['pjsua', '--local-port=5066', '--auto-answer=200', '--null-audio'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
self.pjc = subprocess.Popen(['pjsua', '--local-port=5067', '--auto-answer=200', '--null-audio'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
- self.ast1.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
- self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ if self.ast_version < AsteriskVersion("1.6.1"):
+ self.ast1.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
+ self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
+ else:
+ self.ast1.cli_exec("dialplan set global TESTAUDIO1 " + self.audiofile1)
+ self.ast1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
def stopProcesses(self):
self.logLastStep("Stopping Processes")
@@ -150,7 +159,10 @@
reactor.callLater(2, self.verifyAudio)
def verifyAudio(self):
- self.ast1.cli_originate("Local/play_recording at test extension detect_audio at test")
+ if self.ast_version < AsteriskVersion("1.6.2"):
+ self.ast1.cli_exec("originate Local/play_recording at test extension detect_audio at test")
+ else:
+ self.ast1.cli_exec("channel originate Local/play_recording at test extension detect_audio at test")
def run(self):
More information about the svn-commits
mailing list