[svn-commits] pabelanger: branch pabelanger/default_settings r1032 - in /asterisk/team/pabe...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Dec 1 11:01:39 CST 2010
Author: pabelanger
Date: Wed Dec 1 11:01:33 2010
New Revision: 1032
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1032
Log:
We have cli_aliases in Asterisk, we might as well use it.
Added:
asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf (with props)
Modified:
asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py
asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test
asterisk/team/pabelanger/default_settings/tests/callparking/run-test
asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test
asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test
asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/stream-file/run-test
asterisk/team/pabelanger/default_settings/tests/fastagi/wait-for-digit/run-test
asterisk/team/pabelanger/default_settings/tests/feature_attended_transfer/run-test
asterisk/team/pabelanger/default_settings/tests/feature_blonde_transfer/run-test
asterisk/team/pabelanger/default_settings/tests/iax2/basic-call/run-test
asterisk/team/pabelanger/default_settings/tests/mixmonitor/run-test
asterisk/team/pabelanger/default_settings/tests/mixmonitor_audiohook_inherit/run-test
asterisk/team/pabelanger/default_settings/tests/one-step-parking/run-test
Added: asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf?view=auto&rev=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf (added)
+++ asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf Wed Dec 1 11:01:33 2010
@@ -1,0 +1,39 @@
+[general]
+template = friendly
+template = asterisk14
+
+[friendly]
+hangup request=channel request hangup
+originate=channel originate
+help=core show help
+pri intense debug span=pri set debug 2 span
+reload=module reload
+
+[asterisk14_tpl](!)
+cdr status=cdr show status
+rtp debug=rtp set debug on
+rtcp debug=rtcp set debug on
+rtcp stats=rtcp set stats on
+stun debug=stun set debug on
+udptl debug=udptl set debug on
+core show globals=dialplan show globals
+core set global=dialplan set global
+core set chanvar=dialplan set chanvar
+agi dumphtml=agi dump html
+ael debug=ael set debug
+funcdevstate list=devstate list
+sip history=sip set history on
+skinny debug=skinny set debug on
+mgcp set debug=mgcp set debug on
+abort shutdown=core abort shutdown
+stop now=core stop now
+stop gracefully=core stop gracefully
+stop when convenient=core stop when convenient
+restart now=core restart now
+restart gracefully=core restart gracefully
+restart when convenient=core restart when convenient
+soft hangup=channel request hangup
+
+[asterisk14](asterisk14_tpl)
+; missing commands
+iax2 set debug=iax2 set debug on
Propchange: asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/default_settings/configs/cli_aliases.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py Wed Dec 1 11:01:33 2010
@@ -134,10 +134,7 @@
asterisk.stop()
"""
# Start by asking to stop gracefully.
- if self.ast_version < AsteriskVersion("1.6.0"):
- self.cli_exec("stop gracefully")
- else:
- self.cli_exec("core stop gracefully")
+ self.cli_exec("stop gracefully")
for i in xrange(5):
time.sleep(1.0)
if self.process.poll() is not None:
@@ -148,10 +145,7 @@
# If the graceful shutdown did not complete within 5 seconds, ask
# Asterisk to stop right now.
- if self.ast_version < AsteriskVersion("1.6.0"):
- self.cli_exec("stop now")
- else:
- self.cli_exec("core stop now")
+ self.cli_exec("stop now")
for i in xrange(5):
time.sleep(1.0)
if self.process.poll() is not None:
@@ -244,48 +238,6 @@
print "'%s' and '%s' are the same file" % (cfg_path, target_path)
except IOError:
print "The destination is not writable '%s'" % target_path
-
- def cli_originate(self, argstr, blocking=True):
- """Starts a call from the CLI and links it to an application or
- context.
-
- Must pass a valid argument string in the following form:
-
- <tech/data> application <appname> appdata
- <tech/data> extension <exten>@<context>
-
- If no context is specified, the 'default' context will be
- used. If no extension is given, the 's' extension will be used.
-
- Keyword Arguments:
- blocking -- When True, do not return from this function until the CLI
- command finishes running. The default is True.
-
- Example Usage:
- asterisk.originate("Local/a_exten at context extension b_exten at context")
- """
-
- args = argstr.split()
- raise_error = False
- if len(args) != 3 and len(args) != 4:
- raise_error = True
- print "Wrong number of arguments."
- if args[1] != "extension" and args[1] != "application":
- raise_error = True
- print '2nd argument must be "extension" or "application"'
- if args[0].find("/") == -1:
- raise_error = True
- print 'Channel dial string must be in the form "tech/data".'
- if raise_error is True:
- raise Exception, "Cannot originate call!\n\
- Argument string must be in one of these forms:\n\
- <tech/data> application <appname> appdata\n\
- <tech/data> extension <exten>@<context>"
-
- if self.ast_version < AsteriskVersion("1.6.2"):
- self.cli_exec("originate %s" % argstr, blocking=blocking)
- else:
- self.cli_exec("channel originate %s" % argstr, blocking=blocking)
def cli_exec(self, cli_cmd, blocking=True):
"""Execute a CLI command on this instance of Asterisk.
Modified: asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test Wed Dec 1 11:01:33 2010
@@ -88,8 +88,7 @@
# 4. B reports results to FastAGI and hangup
def launch_test(self):
self.log_last_step("Originating call to begin test")
- self.ast1.cli_originate(
- "IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
+ self.ast1.cli_exec("originate IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
def start_asterisk(self):
self.log_last_step("Starting Asterisk")
Modified: asterisk/team/pabelanger/default_settings/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/callparking/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/callparking/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/callparking/run-test Wed Dec 1 11:01:33 2010
@@ -70,8 +70,7 @@
def get_result_b(self, agi):
self.log_last_step("got AGI connection from userB. "
"Initiate new call between userB and userC now")
- self.ast1.cli_originate(
- "IAX2/userB at 127.0.0.1:4572/c_exten extension bridge_to_B at parking")
+ self.ast1.cli_exec("originate IAX2/userB at 127.0.0.1:4572/c_exten extension bridge_to_B at parking")
return agi.finish()
# This gets invoked by the dialplan when userC has parked userB to 702.
@@ -79,8 +78,7 @@
def get_result_c(self, agi):
self.log_last_step("got AGI connection from userC. "
"Now retrieve userA -> call 701")
- self.ast3.cli_originate(
- "IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
+ self.ast3.cli_exec("originate IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
return agi.finish()
# This gets invoked by the dialplan when userC has retrieved userA.
@@ -88,8 +86,7 @@
def get_result_retrieve_A(self, agi):
self.log_last_step("got AGI connection from userC. "
"userA retrieved successfully, now retrieve userB")
- self.ast3.cli_originate(
- "IAX2/userA at 127.0.0.1:4570/702 extension retrieve_B at parking")
+ self.ast3.cli_exec("originate IAX2/userA at 127.0.0.1:4570/702 extension retrieve_B at parking")
return agi.finish()
# This gets invoked by the dialplan when userC has retrieved userB.
@@ -138,8 +135,7 @@
def launch_test(self):
self.log_last_step("Originating call to begin test")
- self.ast1.cli_originate(
- "IAX2/userA at 127.0.0.1:4571/b_exten extension bridge_to_A at parking")
+ self.ast1.cli_exec("originate IAX2/userA at 127.0.0.1:4571/b_exten extension bridge_to_A at parking")
def start_asterisk(self):
self.log_last_step("Starting Asterisk")
Modified: asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test Wed Dec 1 11:01:33 2010
@@ -68,11 +68,7 @@
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
-
- 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
+ self.ast1.cli_exec("core show globals") # The global variables here hold failure conditions
if self.passed == True:
print 'SIP ChanSpy test PASSED!'
@@ -123,12 +119,8 @@
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)
- 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)
+ self.ast1.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
+ self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
def stopProcesses(self):
self.logLastStep("Stopping Processes")
@@ -142,16 +134,10 @@
def callChanSpy(self):
self.logLastStep("Placing call to ChanSpy extension.")
- 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")
+ self.ast1.cli_exec("originate SIP/end_b extension chanspytest at test")
def verifyAudio(self):
- 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")
+ self.ast1.cli_exec("originate Local/play_recording at test extension detect_audio at test")
def run(self):
Modified: asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test Wed Dec 1 11:01:33 2010
@@ -64,17 +64,12 @@
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
-
- 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
+ self.ast1.cli_exec("core 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()
@@ -131,12 +126,8 @@
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)
- 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)
+ self.ast1.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
+ self.ast1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
def stopProcesses(self):
self.logLastStep("Stopping Processes")
@@ -159,10 +150,7 @@
reactor.callLater(2, self.verifyAudio)
def verifyAudio(self):
- 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")
+ self.ast1.cli_exec("originate Local/play_recording at test extension detect_audio at test")
def run(self):
Modified: asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test Wed Dec 1 11:01:33 2010
@@ -114,10 +114,7 @@
def launch_test1(self):
self.log_last_step("Starting Test 1")
- if self.ast_version < AsteriskVersion("1.6.2"):
- self.ast1.cli_exec("originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
- else:
- self.ast1.cli_exec("channel originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
+ self.ast1.cli_exec("originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
self.test1_pickup()
def test2_pickup(self):
@@ -131,7 +128,7 @@
self.test2 = SKIP
self.shut_down()
else:
- self.ast1.cli_exec("channel originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
+ self.ast1.cli_exec("originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
self.test2_pickup()
def start_asterisk(self):
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test Wed Dec 1 11:01:33 2010
@@ -88,10 +88,7 @@
else:
self.ast1.cli_exec("core show channels")
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
+ self.ast1.cli_exec("core show globals")
print "FAIL - View result of 'core show globals' in log for",\
"more detailed failure results."
@@ -110,10 +107,7 @@
# Set blocking=False so that we can test channel
# status before call is answered.
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/no_answer at agitest extension echo at agitest", blocking=False
- )
-
+ self.ast1.cli_exec("originate Local/no_answer at agitest extension echo at agitest")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test Wed Dec 1 11:01:33 2010
@@ -54,11 +54,7 @@
print "PASS - FastAGI connection works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI Connection test failed. View result of\
'core show globals' in log for more detailed failure\
@@ -72,9 +68,7 @@
def launch_test(self):
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/501 at agitest extension echo at agitest"
- )
+ self.ast1.cli_exec("orignate Local/501 at agitest extension echo at agitest")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test Wed Dec 1 11:01:33 2010
@@ -65,15 +65,12 @@
print "PASS - FastAGI CONTROL STREAM FILE works as expected."
else:
self.ast1.cli_exec("core show channels")
+ self.ast1.cli_exec("core show globals")
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
- print "FAIL - FastAGI CONTROL STREAM FILE test failed. You",\
+ print "FAIL - FastAGI CONTROL STREAM FILE test failed. You",\
"may need to update StarPy. Starpy 1.0.0a13 and older",\
"will always fail this test."
- print "View result of 'core show globals' in log for more\
+ print "View result of 'core show globals' in log for more\
detailed failure results."
self.stop_asterisk()
@@ -86,9 +83,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/504 at agitest extension echo at agitest"
- )
+ self.ast1.cli_exec("originate Local/504 at agitest extension echo at agitest")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test Wed Dec 1 11:01:33 2010
@@ -189,9 +189,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/506 at agitest extension echo at agitest"
- )
+ self.ast1.cli_exec("originate Local/506 at agitest extension echo at agitest")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test Wed Dec 1 11:01:33 2010
@@ -174,9 +174,7 @@
def launch_test(self):
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/507 at agitest extension echo at agitest"
- )
+ self.ast1.cli_exec("originate Local/507 at agitest extension echo at agitest")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test Wed Dec 1 11:01:33 2010
@@ -73,11 +73,7 @@
print "PASS - FastAGI GET DATA works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI GET DATA test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -93,9 +89,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/502 at agitest extension 1 at get-data"
- )
+ self.ast1.cli_exec("originate Local/502 at agitest extension 1 at get-data")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test Wed Dec 1 11:01:33 2010
@@ -94,11 +94,7 @@
print "PASS - FastAGI HANGUP works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
+ self.ast1.cli_exec("core show globals")
print "FAIL - View result of 'core show globals' in log for more",\
"detailed failure results."
@@ -113,9 +109,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/503 at agitest extension echo at agitest"
- )
+ self.ast1.cli_exec("originate Local/503 at agitest extension echo at agitest")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test Wed Dec 1 11:01:33 2010
@@ -111,11 +111,7 @@
if self.overall_result is False:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI RECORD FILE test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -131,13 +127,9 @@
print "Originating call to begin test which terminates recording",\
"with", self.test
if self.test is "DTMF":
- self.ast1.cli_originate(
- "Local/508 at agitest extension 1 at record-file"
- )
+ self.ast1.cli_exec("originate Local/508 at agitest extension 1 at record-file")
elif self.test is "HANGUP":
- self.ast1.cli_originate(
- "Local/509 at agitest extension 2 at record-file"
- )
+ self.ast1.cli_exec("originate Local/509 at agitest extension 2 at record-file")
else:
self.result_changed()
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test Wed Dec 1 11:01:33 2010
@@ -75,13 +75,7 @@
print "PASS - FastAGI SAY ALPHA works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
- print "AGI reports success: ", self.passed
- print "Diaplan reports success: ", self.notified
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI SAY ALPHA test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -97,9 +91,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/510 at agitest extension 1 at td_and_agi_notify"
- )
+ self.ast1.cli_exec("originate Local/510 at agitest extension 1 at td_and_agi_notify")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test Wed Dec 1 11:01:33 2010
@@ -76,13 +76,7 @@
print "PASS - FastAGI SAY DATE works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
- print "AGI reports success: ", self.passed
- print "Diaplan reports success: ", self.notified
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI SAY DATE test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -98,9 +92,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/511 at agitest extension 1 at td_and_agi_notify"
- )
+ self.ast1.cli_exec("originate Local/511 at agitest extension 1 at td_and_agi_notify")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test Wed Dec 1 11:01:33 2010
@@ -75,13 +75,7 @@
print "PASS - FastAGI SAY DATETIME works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
- print "AGI reports success: ", self.passed
- print "Diaplan reports success: ", self.notified
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI SAY DATETIME test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -97,9 +91,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/512 at agitest extension 1 at td_and_agi_notify"
- )
+ self.ast1.cli_exec("originate Local/512 at agitest extension 1 at td_and_agi_notify")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test Wed Dec 1 11:01:33 2010
@@ -75,13 +75,7 @@
print "PASS - FastAGI SAY DIGITS works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
- print "AGI reports success: ", self.passed
- print "Diaplan reports success: ", self.notified
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI SAY DIGITS test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -97,9 +91,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/514 at agitest extension 1 at td_and_agi_notify"
- )
+ self.ast1.cli_exec("originate Local/514 at agitest extension 1 at td_and_agi_notify")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test Wed Dec 1 11:01:33 2010
@@ -75,13 +75,7 @@
print "PASS - FastAGI SAY NUMBER works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
- print "AGI reports success: ", self.passed
- print "Diaplan reports success: ", self.notified
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI SAY NUMBER test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -97,9 +91,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/515 at agitest extension 1 at td_and_agi_notify"
- )
+ self.ast1.cli_exec("originate Local/515 at agitest extension 1 at td_and_agi_notify")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test Wed Dec 1 11:01:33 2010
@@ -75,13 +75,7 @@
print "PASS - FastAGI SAY PHONETIC works as expected."
else:
self.ast1.cli_exec("core show channels")
-
- if self.ast_version < AsteriskVersion("1.6.1"):
- self.ast1.cli_exec("core show globals")
- else:
- self.ast1.cli_exec("dialplan show globals")
- print "AGI reports success: ", self.passed
- print "Diaplan reports success: ", self.notified
+ self.ast1.cli_exec("core show globals")
print "FAIL - FastAGI SAY PHONETIC test failed. View result",\
"of 'core show globals' in log for more detailed",\
@@ -97,9 +91,7 @@
self.ast1.cli_exec("agi set debug on")
print "Originating call to begin test."
- self.ast1.cli_originate(
- "Local/516 at agitest extension 1 at td_and_agi_notify"
- )
+ self.ast1.cli_exec("originate Local/516 at agitest extension 1 at td_and_agi_notify")
def start_asterisk(self):
print "Starting Asterisk"
Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test?view=diff&rev=1032&r1=1031&r2=1032
==============================================================================
[... 275 lines stripped ...]
More information about the svn-commits
mailing list