[asterisk-commits] pabelanger: testsuite/asterisk/trunk r1529 - in /asterisk/trunk/tests: chansp...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Thu May 19 12:39:14 2011
New Revision: 1529

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1529
Log:
Additional fixes for previous merge

Modified:
    asterisk/trunk/tests/chanspy/chanspy_barge/run-test
    asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test
    asterisk/trunk/tests/udptl/configs/ast1/manager.general.conf.inc
    asterisk/trunk/tests/udptl/configs/ast2/manager.general.conf.inc
    asterisk/trunk/tests/udptl/run-test

Modified: asterisk/trunk/tests/chanspy/chanspy_barge/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/chanspy/chanspy_barge/run-test?view=diff&rev=1529&r1=1528&r2=1529
==============================================================================
--- asterisk/trunk/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/trunk/tests/chanspy/chanspy_barge/run-test Thu May 19 12:39:14 2011
@@ -37,6 +37,9 @@
         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)
 

Modified: asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test?view=diff&rev=1529&r1=1528&r2=1529
==============================================================================
--- asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test (original)
+++ asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test Thu May 19 12:39:14 2011
@@ -38,6 +38,9 @@
         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)
 

Modified: asterisk/trunk/tests/udptl/configs/ast1/manager.general.conf.inc
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/udptl/configs/ast1/manager.general.conf.inc?view=diff&rev=1529&r1=1528&r2=1529
==============================================================================
--- asterisk/trunk/tests/udptl/configs/ast1/manager.general.conf.inc (original)
+++ asterisk/trunk/tests/udptl/configs/ast1/manager.general.conf.inc Thu May 19 12:39:14 2011
@@ -1,6 +1,1 @@
 enabled = yes
-
-[user]
-secret = mysecret
-read = system,call,log,verbose,agent,user,config,dtmf,reporting,cdr,dialplan
-write = system,call,agent,user,config,command,reporting,originate

Modified: asterisk/trunk/tests/udptl/configs/ast2/manager.general.conf.inc
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/udptl/configs/ast2/manager.general.conf.inc?view=diff&rev=1529&r1=1528&r2=1529
==============================================================================
--- asterisk/trunk/tests/udptl/configs/ast2/manager.general.conf.inc (original)
+++ asterisk/trunk/tests/udptl/configs/ast2/manager.general.conf.inc Thu May 19 12:39:14 2011
@@ -1,7 +1,2 @@
 enabled = yes
 bindaddr = 127.0.0.2
-
-[user]
-secret = mysecret
-read = system,call,log,verbose,agent,user,config,dtmf,reporting,cdr,dialplan
-write = system,call,agent,user,config,command,reporting,originate

Modified: asterisk/trunk/tests/udptl/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/udptl/run-test?view=diff&rev=1529&r1=1528&r2=1529
==============================================================================
--- asterisk/trunk/tests/udptl/run-test (original)
+++ asterisk/trunk/tests/udptl/run-test Thu May 19 12:39:14 2011
@@ -46,7 +46,7 @@
             print "UDPTL test failed!"
 
     def ami_login(self):
-        self.create_ami_factory(2, "user", "mysecret")
+        self.create_ami_factory(2)
 
     def run(self):
         TestCase.run(self)