[asterisk-commits] pabelanger: branch pabelanger/RemoveOptionParser r1948 - in /asterisk/team/pa...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Aug 25 17:53:26 CDT 2011


Author: pabelanger
Date: Thu Aug 25 17:53:22 2011
New Revision: 1948

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1948
Log:
Remove OptionParser code

Modified:
    asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/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/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/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/wait-for-digit/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/iax2/basic-call/run-test
    asterisk/team/pabelanger/RemoveOptionParser/tests/manager/event-monitor/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/udptl_v6/run-test

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=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/blind-transfer-parkingtimeout/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import math
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor
 from starpy import fastagi
@@ -30,13 +29,6 @@
         # Test timeout in seconds
         self.timeout = 60
         self.last_step = ""
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-         help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # FastAGI, listen for results from dialplan
         self.agi_b = fastagi.FastAGIFactory(self.get_result_b)

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=1948&r1=1947&r2=1948
==============================================================================
--- 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 Thu Aug 25 17:53:22 2011
@@ -11,7 +11,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -28,16 +27,8 @@
         self.last_step = ""
         self.passed = False
 
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
-
         reactor.callWhenRunning(self.run)
 
-        print self.ast_version
         self.ast1 = Asterisk(base=workingdir)
         self.ast1.install_configs("%s/configs/ast1" % (testdir))
 

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=1948&r1=1947&r2=1948
==============================================================================
--- 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 Thu Aug 25 17:53:22 2011
@@ -11,7 +11,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -27,13 +26,6 @@
     def __init__(self, argv):
         self.last_step = ""
         self.passed = False
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

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=1948&r1=1947&r2=1948
==============================================================================
--- 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 Thu Aug 25 17:53:22 2011
@@ -12,7 +12,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -28,13 +27,6 @@
     def __init__(self, argv):
         self.last_step = ""
         self.passed = False
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

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=1948&r1=1947&r2=1948
==============================================================================
--- 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 Thu Aug 25 17:53:22 2011
@@ -11,7 +11,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -27,13 +26,6 @@
     def __init__(self, argv):
         self.last_step = ""
         self.passed = False
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

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=1948&r1=1947&r2=1948
==============================================================================
--- 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 Thu Aug 25 17:53:22 2011
@@ -12,7 +12,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -28,13 +27,6 @@
     def __init__(self, argv):
         self.last_step = ""
         self.passed = False
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

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=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_register/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/channels/SIP/sip_register/run-test Thu Aug 25 17:53:22 2011
@@ -11,7 +11,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -28,13 +27,6 @@
         self.passed = False
         self.last_step = ""
         self.sipps = {}
-
-        #get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

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=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_barge/run-test Thu Aug 25 17:53:22 2011
@@ -11,7 +11,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -33,21 +32,9 @@
         self.talkDetected = 0
         self.test_to = 25
 
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
-
         reactor.callWhenRunning(self.run)
         self.agi = fastagi.FastAGIFactory(self.reportPassed)
         reactor.listenTCP(4573, self.agi, self.test_to, '127.0.0.1')
-
-        print self.ast_version
 
         ast_conf_options = {
             "transmit_silence" : "yes",

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=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_w_mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/chanspy/chanspy_w_mixmonitor/run-test Thu Aug 25 17:53:22 2011
@@ -11,7 +11,6 @@
 import os
 import signal
 import subprocess
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import manager
@@ -34,21 +33,10 @@
         self.talkDetected = 0
         self.test_to = 30
 
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
-
         reactor.callWhenRunning(self.run)
         self.agi = fastagi.FastAGIFactory(self.reportPassed)
         reactor.listenTCP(4573, self.agi, self.test_to, '127.0.0.1')
 
-        print self.ast_version
         self.ast1 = Asterisk(base=workingdir)
         self.ast1.install_configs("%s/configs/ast1" % (testdir))
         self.talkingaudio = os.path.join(os.getcwd(), "%s/sounds/talking" % (testdir))

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=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import time
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor
 from starpy import fastagi
@@ -35,16 +34,6 @@
         self.test1_res = NOT_RUN
         self.test2_res = NOT_RUN
         self.passed = FAIL
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # FastAGI, listen for results from dialplan
         # PASS on port 4573

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/execute/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/execute/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/execute/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/execute/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/get-data/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/get-data/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/get-data/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/get-data/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -24,15 +23,6 @@
     def __init__(self, argv):
         self.passed = False
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/hangup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/hangup/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/hangup/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/hangup/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import time
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -26,15 +25,6 @@
         self.passed = False
         self.timeout = 30
         self.test = 1
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/record-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/record-file/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/record-file/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/record-file/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -32,15 +31,6 @@
         self.key = "fastagitest"
         self.overall_result = True
         self.agi = ""
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-alpha/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-alpha/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-alpha/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-alpha/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -26,15 +25,6 @@
         self.passed = False
         self.notified = False
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-date/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-date/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-date/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-date/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -27,15 +26,6 @@
         self.notified = False
         self.test = "COMPLETE"
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-datetime/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-datetime/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-datetime/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-datetime/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -25,15 +24,6 @@
         self.passed = False
         self.notified = False
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-digits/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-digits/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-digits/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-digits/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -26,15 +25,6 @@
         self.passed = False
         self.notified = False
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-number/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-number/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-number/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-number/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -26,15 +25,6 @@
         self.passed = False
         self.notified = False
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-phonetic/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-phonetic/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-phonetic/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-phonetic/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -26,15 +25,6 @@
         self.passed = False
         self.notified = False
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-time/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-time/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-time/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/say-time/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -27,15 +26,6 @@
         self.notified = False
         self.test = "COMPLETE"
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/wait-for-digit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/wait-for-digit/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/wait-for-digit/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fastagi/wait-for-digit/run-test Thu Aug 25 17:53:22 2011
@@ -9,7 +9,6 @@
 
 import sys
 import os
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -25,15 +24,6 @@
     def __init__(self, argv):
         self.passed = False
         self.timeout = 30
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         # Listen for results from dialplan
         self.agi_factory = fastagi.FastAGIFactory(self.do_test)

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/feature_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/feature_attended_transfer/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/feature_attended_transfer/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/feature_attended_transfer/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import math
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor
 from starpy import manager
@@ -32,16 +31,6 @@
 
         # Test timeout in seconds
         self.test_to = 45
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/feature_blonde_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/feature_blonde_transfer/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/feature_blonde_transfer/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/feature_blonde_transfer/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import math
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor
 from starpy import manager
@@ -31,16 +30,6 @@
 
         # Test timeout in seconds
         self.test_to = 45
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/iax2/basic-call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/iax2/basic-call/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/iax2/basic-call/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/iax2/basic-call/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import time
-from optparse import OptionParser
 from twisted.application import service, internet
 from twisted.internet import reactor, defer
 from starpy import fastagi
@@ -32,15 +31,6 @@
         self.f = fastagi.FastAGIFactory(self.fastagi_func)
         reactor.listenTCP(4573, self.f, 50, '127.0.0.1')
         reactor.callWhenRunning(self.run)
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         print "Creating Asterisk instances ..."
 

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/manager/event-monitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/manager/event-monitor/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/manager/event-monitor/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/manager/event-monitor/run-test Thu Aug 25 17:53:22 2011
@@ -6,8 +6,6 @@
 from twisted.internet import reactor
 from starpy import manager, fastagi, utilapplication, menu
 import os, logging, pprint, time, sys
-
-from optparse import OptionParser
 
 """
 This test module should serve as a template for new event monitoring tests. A
@@ -33,21 +31,8 @@
     if argv is None:
         argv = sys.argv
 
-    if len(argv) == 1: # options are NOT being passed
-        sys.path.append("../../lib/python")
-        asterisk = None
-    else:
-        sys.path.append("lib/python")
-        from asterisk.asterisk import Asterisk
-
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                              help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        working_dir = os.path.dirname(argv[0])
-
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1")
+    ast1 = Asterisk(base=workingdir)
+    ast1.install_configs("%s/configs/ast1")
 
     logging.basicConfig()
     import client

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import math
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import manager
 
@@ -31,16 +30,6 @@
         self.audiofile1size = -1
         self.audiofile2size = -1
         self.audiofile3size = -1
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor_audiohook_inherit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor_audiohook_inherit/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor_audiohook_inherit/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/mixmonitor_audiohook_inherit/run-test Thu Aug 25 17:53:22 2011
@@ -10,7 +10,6 @@
 import sys
 import os
 import math
-from optparse import OptionParser
 from twisted.internet import reactor
 from starpy import manager
 
@@ -28,13 +27,6 @@
         # if audiohook inherit does not work, file will be much smaller than 150000 bytes
         self.expectedfilesize = 120000
         self.audiofile1size = -1
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                          help="Asterisk version string")
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 
         reactor.callWhenRunning(self.run)
 

Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/one-step-parking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/one-step-parking/run-test?view=diff&rev=1948&r1=1947&r2=1948
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/one-step-parking/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/one-step-parking/run-test Thu Aug 25 17:53:22 2011
@@ -10,8 +10,6 @@
 import sys
 import os
 import math
-from optparse import OptionParser
-from twisted.application import service, internet
 from twisted.internet import reactor
 from starpy import fastagi
 
@@ -30,16 +28,6 @@
         # Test timeout in seconds
         self.timeout = 60
         self.last_step = ""
-
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-            help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-
-        (options, args) = parser.parse_args(argv)
-        self.ast_version = AsteriskVersion(options.ast_version)
 

[... 64 lines stripped ...]



More information about the asterisk-commits mailing list