[svn-commits] pabelanger: branch pabelanger/RemoveOptionParser r1960 - in /asterisk/team/pa...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Aug 26 12:33:49 CDT 2011
Author: pabelanger
Date: Fri Aug 26 12:33:45 2011
New Revision: 1960
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1960
Log:
Comments from reviewboard
Modified:
asterisk/team/pabelanger/RemoveOptionParser/asttest/asttest.c
asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py
asterisk/team/pabelanger/RemoveOptionParser/runtests.py
asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/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
Modified: asterisk/team/pabelanger/RemoveOptionParser/asttest/asttest.c
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/asttest/asttest.c?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/asttest/asttest.c (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/asttest/asttest.c Fri Aug 26 12:33:45 2011
@@ -55,7 +55,6 @@
" -v <version> Specify the version of asterisk we are testing against. If\n"
" not specified, the version.h file from the specified asterisk\n"
" path will be usedi to determine the version number.\n"
- " -n <name> Reserved.\n"
"\n"
, prog_name, prog_name);
}
@@ -93,9 +92,6 @@
break;
case 'a':
opts->asterisk_path = optarg;
- break;
- case 'n':
- /* Reserved */
break;
case 's':
opts->single_test_mode = optarg;
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=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/lib/python/asterisk/TestCase.py Fri Aug 26 12:33:45 2011
@@ -40,7 +40,6 @@
for c in range(count):
print "Creating Asterisk instance %d ..." % (c + 1)
self.ast.append(Asterisk(base=self.base))
-# self.ast[c].valgrind = self.options.valgrind
# Copy shared config files
self.ast[c].install_configs("%s/configs" %
(self.test_name))
Modified: asterisk/team/pabelanger/RemoveOptionParser/runtests.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/runtests.py?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/runtests.py (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/runtests.py Fri Aug 26 12:33:45 2011
@@ -158,8 +158,6 @@
cmd = [
"%s/run-test" % self.test_name,
]
- if self.options.valgrind:
- cmd.append("--valgrind")
if os.path.exists(cmd[0]) and os.access(cmd[0], os.X_OK):
print "Running %s ..." % cmd
try:
@@ -424,9 +422,6 @@
parser.add_option("-t", "--test",
dest="test",
help="Run a single specified test instead of all tests.")
- parser.add_option("--valgrind", action="store_true",
- dest="valgrind", default=False,
- help="Run Asterisk under valgrind.")
(options, args) = parser.parse_args(argv)
# Check to see if this has been executed within a sub directory of an
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=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/directed_pickup/run-test Fri Aug 26 12:33:45 2011
@@ -109,16 +109,16 @@
def test2_pickup(self):
self.log_last_step("Issuing the pickup")
+ self.ast1.cli_originate("Local/1003 at pickuptest application echo")
+
+ def launch_test2(self):
+ self.log_last_step("Starting Test 2")
if self.ast1.ast_version < AsteriskVersion('1.8'):
self.test2 = SKIP
self.shut_down()
else:
- self.ast1.cli_originate("Local/1003 at pickuptest application echo")
-
- def launch_test2(self):
- self.log_last_step("Starting Test 2")
- self.ast1.cli_originate("IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
- self.test2_pickup()
+ self.ast1.cli_originate("IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
+ self.test2_pickup()
def start_asterisk(self):
self.log_last_step("Starting Asterisk")
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_g711_t38/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_g711_t38/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_g711_t38/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_g711_t38/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix1/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix1/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix1/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix1/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix2/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix2/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix2/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix2/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix3/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix3/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix3/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix3/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix4/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix4/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix4/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_mix4/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(ros.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38_ced/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38_ced/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38_ced/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_native_t38_ced/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_no_t38/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_no_t38/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_no_t38/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_no_t38/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_t38_g711/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_t38_g711/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_t38_g711/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_t38_g711/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout1/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout1/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout1/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout1/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout2/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout2/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout2/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout2/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout3/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout3/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout3/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout3/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout4/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout4/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout4/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout4/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
Modified: asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout5/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout5/run-test?view=diff&rev=1960&r1=1959&r2=1960
==============================================================================
--- asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout5/run-test (original)
+++ asterisk/team/pabelanger/RemoveOptionParser/tests/fax/gateway_timeout5/run-test Fri Aug 26 12:33:45 2011
@@ -29,7 +29,7 @@
self.create_asterisk(2)
# copy the tiff file we are going to send to a good known location
- shutil.copy("%s/send.tiff" % (os.path.dirname(sys.argv[0]),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
+ shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
def ami_connect(self, ami):
TestCase.ami_connect(self, ami)
More information about the svn-commits
mailing list