[svn-commits] pabelanger: branch pabelanger/RemoveOptionParser r1958 - in /asterisk/team/pa...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Aug 26 10:46:22 CDT 2011
Author: pabelanger
Date: Fri Aug 26 10:46:17 2011
New Revision: 1958
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1958
Log:
Remove argv from tests.
Modified:
asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py
asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_attendant_exit/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_context_operator_exit/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_operator_exit/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/apps/voicemail/leave_voicemail_nominal/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/callparking/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_auth/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_disabled/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_from_call/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_unauth/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/options/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/secure_bridge_media/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_tcp/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_v6/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer_v6/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_register/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_srtp/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_tls_call/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_barge/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_w_mixmonitor/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/dynamic-modules/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/channel-status/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/connect/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/control-stream-file/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/database/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/execute/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/get-data/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/hangup/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/record-file/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-alpha/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-date/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-datetime/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-digits/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-number/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-phonetic/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-time/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/stream-file/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/wait-for-digit/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_g711_t38/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix1/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix2/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix3/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix4/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38_ced/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_no_t38/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_t38_g711/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout1/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout2/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout3/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout4/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout5/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/feature_attended_transfer/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/feature_blonde_transfer/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/func_srv/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/iax2/basic-call/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/manager/event-monitor/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/manager/login/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor_audiohook_inherit/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/one-step-parking/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/pbx/call-files/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/pbx/merge_contexts/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/pbx/pbx_lua_background/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/pbx/pbx_lua_goto/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/regressions/M18882/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/udptl/run-test
asterisk/team/pabelanger/RemoveOptionParser/tests/udptl_v6/run-test
Modified: asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py Fri Aug 26 10:46:17 2011
@@ -24,13 +24,7 @@
reactor_timeout = 30
passed = False
- def __init__(self, argv):
- """
-
- Keywork arguments:
- argv --
-
- """
+ def __init__(self):
self.test_name = os.path.dirname(sys.argv[0])
self.base = self.test_name.lstrip("tests/")
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_attendant_exit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_attendant_exit/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_attendant_exit/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_attendant_exit/run-test Fri Aug 26 10:46:17 2011
@@ -22,13 +22,13 @@
class DirectoryTest(TestCase):
reactor_timeout = 60
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.create_asterisk(2)
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
-
+
ami.registerEvent('UserEvent', self.user_event)
if ami.id == 0:
@@ -64,8 +64,8 @@
self.create_ami_factory(2)
-def main(argv = sys.argv):
- test = DirectoryTest(argv)
+def main():
+ test = DirectoryTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_context_operator_exit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_context_operator_exit/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_context_operator_exit/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_context_operator_exit/run-test Fri Aug 26 10:46:17 2011
@@ -22,13 +22,13 @@
class DirectoryTest(TestCase):
reactor_timeout = 60
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.create_asterisk(2)
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
-
+
ami.registerEvent('UserEvent', self.user_event)
if ami.id == 0:
@@ -64,8 +64,8 @@
self.create_ami_factory(2)
-def main(argv = sys.argv):
- test = DirectoryTest(argv)
+def main():
+ test = DirectoryTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_operator_exit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_operator_exit/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_operator_exit/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/apps/directory_operator_exit/run-test Fri Aug 26 10:46:17 2011
@@ -22,13 +22,13 @@
class DirectoryTest(TestCase):
reactor_timeout = 60
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.create_asterisk(2)
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
-
+
ami.registerEvent('UserEvent', self.user_event)
if ami.id == 0:
@@ -64,8 +64,8 @@
self.create_ami_factory(2)
-def main(argv = sys.argv):
- test = DirectoryTest(argv)
+def main():
+ test = DirectoryTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/apps/voicemail/leave_voicemail_nominal/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/apps/voicemail/leave_voicemail_nominal/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/apps/voicemail/leave_voicemail_nominal/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/apps/voicemail/leave_voicemail_nominal/run-test Fri Aug 26 10:46:17 2011
@@ -22,17 +22,17 @@
from asterisk.TestCase import TestCase
from asterisk.voicemail import VoiceMailMailboxManagement
+
class LeaveVoicemailNominal(TestCase):
"""The parent directory that this test resides in
"""
testParentDir = "tests/apps/voicemail"
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.create_asterisk(2)
-
def ami_connect(self, ami):
print str(datetime.now()) + " Got AMI Connect for instance " + str(ami.id)
@@ -51,14 +51,12 @@
df = ami.originate("sip/ast1/" + str(extension), "sendvoicemail", str(extension), 1, None, "CallId-" + str(extension), None, None, None, {}, True )
df.addErrback(self.handleOriginateFailure)
-
def handleOriginateFailure(self, reason):
print str(datetime.now()) + " error sending originate:"
print reason.getTraceback()
self.stop_reactor()
return reason
-
def user_event(self, ami, event):
if event['userevent'] != 'TestResult':
@@ -80,9 +78,8 @@
self.create_ami_factory(2)
-def main(argv = sys.argv):
-
- test = LeaveVoicemailNominal(argv)
+def main():
+ test = LeaveVoicemailNominal()
voicemailManager = VoiceMailMailboxManagement(test.ast[0])
test.start_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/run-test Fri Aug 26 10:46:17 2011
@@ -21,7 +21,7 @@
testdir = "tests/%s" % workingdir
class BlindTransferTest:
- def __init__(self, argv):
+ def __init__(self):
self.passed = False
self.done = False
@@ -105,12 +105,9 @@
reactor.callLater(self.timeout, self.read_result)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run Blind Transfer Test
- blind_transfer_test = BlindTransferTest(argv)
+ blind_transfer_test = BlindTransferTest()
reactor.run()
blind_transfer_test.stop_asterisk()
if blind_transfer_test.passed != True:
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/callparking/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/callparking/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/callparking/run-test Fri Aug 26 10:46:17 2011
@@ -16,8 +16,8 @@
class CallParkingTest(TestCase):
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.ast1_event = False
self.ast2_event = False
@@ -74,12 +74,9 @@
self.create_ami_factory(2)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run CallParking Test
- test = CallParkingTest(argv)
+ test = CallParkingTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_auth/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_auth/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_auth/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_auth/run-test Fri Aug 26 10:46:17 2011
@@ -29,10 +29,7 @@
]
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
return test.run()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_disabled/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_disabled/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_disabled/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_disabled/run-test Fri Aug 26 10:46:17 2011
@@ -24,10 +24,7 @@
]
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
return test.run()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_from_call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_from_call/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_from_call/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_from_call/run-test Fri Aug 26 10:46:17 2011
@@ -29,10 +29,7 @@
]
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
return test.run()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_unauth/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_unauth/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_unauth/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/message_unauth/run-test Fri Aug 26 10:46:17 2011
@@ -29,10 +29,7 @@
]
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
return test.run()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp/run-test Fri Aug 26 10:46:17 2011
@@ -16,8 +16,8 @@
from asterisk.TestCase import TestCase
class SIPCallTest(TestCase):
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.connected_chan1 = False
self.connected_chan2 = False
@@ -75,10 +75,8 @@
print "Test passed"
self.passed = True
-def main(argv=None):
- if argv is None:
- argv = sys.argv
- test = SIPCallTest(argv)
+def main():
+ test = SIPCallTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test Fri Aug 26 10:46:17 2011
@@ -16,8 +16,8 @@
from asterisk.TestCase import TestCase
class SIPCallTest(TestCase):
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.connected_chan1 = False
self.connected_chan2 = False
@@ -109,10 +109,8 @@
print "Test passed"
self.passed = True
-def main(argv=None):
- if argv is None:
- argv = sys.argv
- test = SIPCallTest(argv)
+def main():
+ test = SIPCallTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/options/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/options/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/options/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/options/run-test Fri Aug 26 10:46:17 2011
@@ -26,10 +26,7 @@
]
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
return test.run()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/secure_bridge_media/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/secure_bridge_media/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/secure_bridge_media/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/secure_bridge_media/run-test Fri Aug 26 10:46:17 2011
@@ -16,8 +16,8 @@
from asterisk.TestCase import TestCase
class SIPCallTest(TestCase):
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.connected_chan1 = False
self.connected_chan2 = False
@@ -73,10 +73,8 @@
print "Test passed"
self.passed = True
-def main(argv=None):
- if argv is None:
- argv = sys.argv
- test = SIPCallTest(argv)
+def main():
+ test = SIPCallTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer/run-test Fri Aug 26 10:46:17 2011
@@ -22,7 +22,7 @@
testdir = "tests/%s" % workingdir
class AttTransferTest:
- def __init__(self, argv):
+ def __init__(self):
self.last_step = ""
self.passed = False
@@ -141,12 +141,9 @@
# stop and read results after timeout
reactor.callLater(25, self.readResult)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run Attended Transfer Test
- att_transfer_test = AttTransferTest(argv)
+ att_transfer_test = AttTransferTest()
reactor.run()
att_transfer_test.stopProcesses()
if att_transfer_test.passed != True:
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_tcp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_tcp/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_tcp/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_tcp/run-test Fri Aug 26 10:46:17 2011
@@ -22,7 +22,7 @@
testdir = "tests/%s" % workingdir
class AttTransferTest:
- def __init__(self, argv):
+ def __init__(self):
self.last_step = ""
self.passed = False
@@ -142,12 +142,9 @@
# stop and read results after timeout
reactor.callLater(25, self.readResult)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run Attended Transfer Test
- att_transfer_test = AttTransferTest(argv)
+ att_transfer_test = AttTransferTest()
reactor.run()
att_transfer_test.stopProcesses()
if att_transfer_test.passed != True:
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_v6/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_v6/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_v6/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_attended_transfer_v6/run-test Fri Aug 26 10:46:17 2011
@@ -23,7 +23,7 @@
testdir = "tests/%s" % workingdir
class AttTransferTest:
- def __init__(self, argv):
+ def __init__(self):
self.last_step = ""
self.passed = False
@@ -142,12 +142,9 @@
# stop and read results after timeout
reactor.callLater(25, self.readResult)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run Attended Transfer Test
- att_transfer_test = AttTransferTest(argv)
+ att_transfer_test = AttTransferTest()
reactor.run()
att_transfer_test.stopProcesses()
if att_transfer_test.passed != True:
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer/run-test Fri Aug 26 10:46:17 2011
@@ -22,7 +22,7 @@
testdir = "tests/%s" % workingdir
class AttTransferTest:
- def __init__(self, argv):
+ def __init__(self):
self.last_step = ""
self.passed = False
@@ -144,12 +144,9 @@
# stop and read results after timeout
reactor.callLater(25, self.readResult)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run Attended Transfer Test
- att_transfer_test = AttTransferTest(argv)
+ att_transfer_test = AttTransferTest()
reactor.run()
att_transfer_test.stopProcesses()
if att_transfer_test.passed != True:
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer_v6/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer_v6/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer_v6/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_one_legged_transfer_v6/run-test Fri Aug 26 10:46:17 2011
@@ -23,7 +23,7 @@
testdir = "tests/%s" % workingdir
class AttTransferTest:
- def __init__(self, argv):
+ def __init__(self):
self.last_step = ""
self.passed = False
@@ -145,12 +145,9 @@
# stop and read results after timeout
reactor.callLater(25, self.readResult)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run Attended Transfer Test
- att_transfer_test = AttTransferTest(argv)
+ att_transfer_test = AttTransferTest()
reactor.run()
att_transfer_test.stopProcesses()
if att_transfer_test.passed != True:
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_register/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_register/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_register/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_register/run-test Fri Aug 26 10:46:17 2011
@@ -22,7 +22,7 @@
testdir = "tests/%s" % workingdir
class RegisterTest:
- def __init__(self, argv):
+ def __init__(self):
self.passed = False
self.last_step = ""
self.sipps = {}
@@ -93,12 +93,9 @@
self.ami_login()
reactor.callLater(30, self.stop_reactor)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
+def main():
# Run Register Test
- test = RegisterTest(argv)
+ test = RegisterTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_srtp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_srtp/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_srtp/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_srtp/run-test Fri Aug 26 10:46:17 2011
@@ -16,8 +16,8 @@
from asterisk.TestCase import TestCase
class SIPCallTest(TestCase):
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.connected_chan1 = False
self.connected_chan2 = False
@@ -75,10 +75,8 @@
print "Test passed"
self.passed = True
-def main(argv=None):
- if argv is None:
- argv = sys.argv
- test = SIPCallTest(argv)
+def main():
+ test = SIPCallTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_tls_call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_tls_call/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_tls_call/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_tls_call/run-test Fri Aug 26 10:46:17 2011
@@ -14,7 +14,7 @@
from asterisk.cdr import AsteriskCSVCDR, AsteriskCSVCDRLine
from starpy import manager
-#Quick little function for doing search and replace in a file used below.
+# Quick little function for doing search and replace in a file used below.
def file_replace_string(file, search, replace):
for line in fileinput.input(file, inplace=1):
if search in line:
@@ -28,9 +28,9 @@
"""
class SIPTLSCallTest(TestCase):
- #Preps test objects and configuration additions as well as copies TLS keys to test folder.
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ # Preps test objects and configuration additions as well as copies TLS keys to test folder.
+ def __init__(self):
+ TestCase.__init__(self)
print "Creating Asterisk instances ..."
self.create_asterisk(2)
@@ -38,12 +38,12 @@
workingdir = "channels/SIP/sip_tls_call"
testdir = "tests/%s" % workingdir
- #initialize test variables
+ # initialize test variables
self.passed = False
self.tone1 = False
self.tone2 = False
- #Additional setup for config files and keys
+ # Additional setup for config files and keys
print "Building test resources ..."
shutil.copy('%s/configs/helper1' % (testdir), '%s/configs/ast1/sip_helper.inc' % (testdir))
shutil.copy('%s/configs/helper2' % (testdir), '%s/configs/ast2/sip_helper.inc' % (testdir))
@@ -55,25 +55,23 @@
if os.path.exists('%s/keys' % (workingdir)):
shutil.rmtree('%s/keys' % (workingdir))
shutil.copytree('%s/configs/keys' % (testdir), '%s/keys' % (workingdir))
- #End of additional setup for config files and keys
+ # End of additional setup for config files and keys
-
-
- #Once the AMI Factory connects to the AMI, this function fires.
+ # Once the AMI Factory connects to the AMI, this function fires.
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
print "AMI %d - connected, registering DTMF event..." % (ami.id + 1)
- #This will make the manager listen for DTMF and callback ami_test when it sees some.
+ # This will make the manager listen for DTMF and callback ami_test when it sees some.
ami.registerEvent('DTMF', self.ami_test)
- if ami.id == 0: #We only want to originate the call on the ast[0]'s manager.
+ # We only want to originate the call on the ast[0]'s manager.
+ if ami.id == 0:
print "AMI - originating call from SIP/testast1 to extension 1000 using extension 1000 at priority 1"
ami.originate(channel = "SIP/testast1/1000", context = "default", exten = "1000", priority = "1")
-
- #This test is initiated whenever a DTMF event occurs.
+ # This test is initiated whenever a DTMF event occurs.
def ami_test(self, ami, event):
print "Received DTMF event from AMI %d..." % (ami.id + 1)
@@ -90,27 +88,23 @@
self.passed = True
self.stop_reactor()
-
- #Sets up reactor and AMI connection
+ # Sets up reactor and AMI connection
def run(self):
TestCase.run(self)
- self.create_ami_factory(count = 2) #will link up to ami_connect() once the connection is established
+ # will link up to ami_connect() once the connection is established
+ self.create_ami_factory(count = 2)
+def main():
+ test = SIPTLSCallTest()
+ test.start_asterisk()
+ reactor.run()
-def main(argv=None):
- if argv is None:
- argv = sys.argv
+ test.stop_asterisk()
- test = SIPTLSCallTest(argv) #initializes test (using SIPTLSCallTest.__init__(argv))
- test.start_asterisk() #starts both of the asterisk instances created in SIPTLSCallTest
- reactor.run() #connects AMI which then registers DTMF event callback.
-
- test.stop_asterisk() #Once the reactor is stopped, this will end our Asterisk instances.
-
- if test.passed: #Returns the results of the test
- return 0 #success
- return 1 #failure
+ if test.passed:
+ return 0
+ return 1
if __name__ == "__main__":
sys.exit(main() or 0)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_barge/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_barge/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_barge/run-test Fri Aug 26 10:46:17 2011
@@ -23,7 +23,7 @@
testdir = "tests/%s" % workingdir
class ChanSpyBarge:
- def __init__(self, argv):
+ def __init__(self):
self.last_step = ""
self.passed = False
self.numSpyEvents = 0
@@ -145,12 +145,8 @@
# stop and read results after timeout
reactor.callLater(self.test_to, self.readResult)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
- # Run Test
- test = ChanSpyBarge(argv)
+def main():
+ test = ChanSpyBarge()
test.startProcesses()
reactor.run()
test.stopProcesses()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_w_mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_w_mixmonitor/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_w_mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_w_mixmonitor/run-test Fri Aug 26 10:46:17 2011
@@ -24,7 +24,7 @@
class ChanSpyMixMonitorTest:
- def __init__(self, argv):
+ def __init__(self):
self.last_step = ""
self.passed = False
self.numSpyEvents = 0
@@ -155,12 +155,8 @@
# stop and read results after timeout
reactor.callLater(self.test_to, self.stop_reactor)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
- # Run Test
- test = ChanSpyMixMonitorTest(argv)
+def main():
+ test = ChanSpyMixMonitorTest()
test.startProcesses()
reactor.run()
test.stopProcesses()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test Fri Aug 26 10:46:17 2011
@@ -26,7 +26,7 @@
FAIL = 2
SKIP = 4
class PickupTest:
- def __init__(self, argv):
+ def __init__(self):
# Test timeout in seconds
self.test_to = 15
@@ -143,11 +143,8 @@
reactor.callLater(self.test_to, self.stop_reactor)
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
- test = PickupTest(argv)
+def main():
+ test = PickupTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/dynamic-modules/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/dynamic-modules/run-test?view=diff&rev=1958&r1=1957&r2=1958
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/dynamic-modules/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/dynamic-modules/run-test Fri Aug 26 10:46:17 2011
@@ -18,8 +18,8 @@
class moduleLoadUnloadTest(TestCase):
- def __init__(self, argv):
- TestCase.__init__(self, argv)
+ def __init__(self):
+ TestCase.__init__(self)
self.create_asterisk()
def load_module(self, module):
@@ -151,11 +151,8 @@
self.check_failures(module);
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
- test = moduleLoadUnloadTest(argv)
+def main():
+ test = moduleLoadUnloadTest()
test.start_asterisk()
reactor.run()
test.stop_asterisk()
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/channel-status/run-test
[... 1463 lines stripped ...]
More information about the svn-commits
mailing list