[asterisk-commits] pabelanger: branch pabelanger/configs r893 - in /asterisk/team/pabelanger/con...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat Nov 20 19:33:49 CST 2010


Author: pabelanger
Date: Sat Nov 20 19:33:45 2010
New Revision: 893

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=893
Log:
Move configs directory outside tests.

Add the ability to modify asterisk.conf.  Include files will be named
module.section.conf.inc. EG: settings in logger.general.conf.inc will
be included within the [general] section of logger.conf

Added:
    asterisk/team/pabelanger/configs/configs/
      - copied from r891, asterisk/team/pabelanger/configs/tests/configs/
    asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc   (with props)
    asterisk/team/pabelanger/configs/configs/logger.general.conf.inc   (with props)
    asterisk/team/pabelanger/configs/configs/logger.logfiles.conf.inc
      - copied, changed from r891, asterisk/team/pabelanger/configs/tests/configs/logger.conf.inc
Removed:
    asterisk/team/pabelanger/configs/configs/logger.conf.inc
    asterisk/team/pabelanger/configs/tests/configs/
Modified:
    asterisk/team/pabelanger/configs/configs/branch-1.4/logger.conf
    asterisk/team/pabelanger/configs/configs/branch-1.6.2/logger.conf
    asterisk/team/pabelanger/configs/configs/logger.conf
    asterisk/team/pabelanger/configs/lib/python/asterisk/asterisk.py
    asterisk/team/pabelanger/configs/tests/blind-transfer-parkingtimeout/run-test
    asterisk/team/pabelanger/configs/tests/callparking/run-test
    asterisk/team/pabelanger/configs/tests/directed_pickup/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/channel-status/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/connect/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/control-stream-file/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/database/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/execute/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/get-data/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/hangup/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/record-file/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/say-alpha/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/say-date/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/say-datetime/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/say-digits/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/say-number/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/say-phonetic/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/say-time/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/stream-file/run-test
    asterisk/team/pabelanger/configs/tests/fastagi/wait-for-digit/run-test
    asterisk/team/pabelanger/configs/tests/feature_attended_transfer/run-test
    asterisk/team/pabelanger/configs/tests/feature_blonde_transfer/run-test
    asterisk/team/pabelanger/configs/tests/iax2/basic-call/run-test
    asterisk/team/pabelanger/configs/tests/manager/login/run-test
    asterisk/team/pabelanger/configs/tests/mixmonitor/run-test
    asterisk/team/pabelanger/configs/tests/mixmonitor_audiohook_inherit/run-test
    asterisk/team/pabelanger/configs/tests/one-step-parking/run-test

Added: asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc?view=auto&rev=893
==============================================================================
--- asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc (added)
+++ asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc Sat Nov 20 19:33:45 2010
@@ -1,0 +1,5 @@
+; Global asterisk.conf [options] settings.
+;
+debug = 15
+verbose = 15
+nocolor = yes

Propchange: asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/configs/configs/asterisk.options.conf.inc
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: asterisk/team/pabelanger/configs/configs/branch-1.4/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/configs/branch-1.4/logger.conf?view=diff&rev=893&r1=891&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/configs/branch-1.4/logger.conf (original)
+++ asterisk/team/pabelanger/configs/configs/branch-1.4/logger.conf Sat Nov 20 19:33:45 2010
@@ -1,7 +1,12 @@
+; Global logger.conf settings.
+;
+; IMPORTANT: Place your variables before #include statements
+; so tests have the ability to overwrite them.
+;
 [general]
+#include "logger.general.conf.inc"
 
 [logfiles]
 console => notice,warning,error
 full => notice,warning,error,debug,verbose
-
-#include logger.conf.inc
+#include "logger.logfiles.conf.inc"

Modified: asterisk/team/pabelanger/configs/configs/branch-1.6.2/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/configs/branch-1.6.2/logger.conf?view=diff&rev=893&r1=891&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/configs/branch-1.6.2/logger.conf (original)
+++ asterisk/team/pabelanger/configs/configs/branch-1.6.2/logger.conf Sat Nov 20 19:33:45 2010
@@ -1,7 +1,12 @@
+; Global logger.conf settings.
+;
+; IMPORTANT: Place your variables before #include statements
+; so tests have the ability to overwrite them.
+;
 [general]
+#include "logger.general.conf.inc"
 
 [logfiles]
 console => notice,warning,error
 full => notice,warning,error,debug,verbose
-
-#include logger.conf.inc
+#include "logger.logfiles.conf.inc"

Modified: asterisk/team/pabelanger/configs/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/configs/logger.conf?view=diff&rev=893&r1=891&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/configs/logger.conf (original)
+++ asterisk/team/pabelanger/configs/configs/logger.conf Sat Nov 20 19:33:45 2010
@@ -1,7 +1,12 @@
+; Global logger.conf settings.
+;
+; IMPORTANT: Place your variables before #include statements
+; so tests have the ability to overwrite them.
+;
 [general]
+#include "logger.general.conf.inc"
 
 [logfiles]
 console => notice,warning,error
 full => *
-
-#include logger.conf.inc
+#include "logger.logfiles.conf.inc"

Added: asterisk/team/pabelanger/configs/configs/logger.general.conf.inc
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/configs/logger.general.conf.inc?view=auto&rev=893
==============================================================================
--- asterisk/team/pabelanger/configs/configs/logger.general.conf.inc (added)
+++ asterisk/team/pabelanger/configs/configs/logger.general.conf.inc Sat Nov 20 19:33:45 2010
@@ -1,0 +1,1 @@
+; Do not delete

Propchange: asterisk/team/pabelanger/configs/configs/logger.general.conf.inc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/configs/configs/logger.general.conf.inc
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/configs/configs/logger.general.conf.inc
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: asterisk/team/pabelanger/configs/configs/logger.logfiles.conf.inc (from r891, asterisk/team/pabelanger/configs/tests/configs/logger.conf.inc)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/configs/logger.logfiles.conf.inc?view=diff&rev=893&p1=asterisk/team/pabelanger/configs/tests/configs/logger.conf.inc&r1=891&p2=asterisk/team/pabelanger/configs/configs/logger.logfiles.conf.inc&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/configs/logger.conf.inc (original)
+++ asterisk/team/pabelanger/configs/configs/logger.logfiles.conf.inc Sat Nov 20 19:33:45 2010
@@ -1,1 +1,1 @@
-; Do not delete.
+; Do not delete

Modified: asterisk/team/pabelanger/configs/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/lib/python/asterisk/asterisk.py?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/pabelanger/configs/lib/python/asterisk/asterisk.py Sat Nov 20 19:33:45 2010
@@ -100,7 +100,7 @@
         for (var, val) in dir_cat.options:
             self.__mirror_dir(var, val)
 
-        self.install_configs(os.getcwd() + "/tests/configs")
+        self.install_configs(os.getcwd() + "/configs")
 
     def start(self):
         """Start this instance of Asterisk.
@@ -349,17 +349,17 @@
             return
 
         for c in ast_conf.categories:
-            f.write("[%s]\n\n" % c.name)
+            f.write("[%s]\n" % c.name)
             if c.name == "directories":
                 for (var, val) in c.options:
                     self.directories[var] = val
                     f.write("%s = %s%s\n" % (var, self.base, val))
             elif c.name == "options":
+                f.write("#include \"%s/asterisk.options.conf.inc\"\n" %
+                        (self.astetcdir))
                 if ast_conf_options:
                     for (var, val) in ast_conf_options.iteritems():
                         f.write("%s = %s\n" % (var, val))
-                if not ast_conf_options or "nocolor" not in ast_conf_options:
-                    f.write("nocolor = yes\n")
                 for (var, val) in c.options:
                     if not ast_conf_options or var not in ast_conf_options:
                         f.write("%s = %s\n" % (var, val))

Modified: asterisk/team/pabelanger/configs/tests/blind-transfer-parkingtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/blind-transfer-parkingtimeout/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/blind-transfer-parkingtimeout/run-test Sat Nov 20 19:33:45 2010
@@ -90,9 +90,6 @@
     # 3.  A gets parkingtimeout and returns to B
     # 4.  B reports results to FastAGI and hangup
     def launch_test(self):
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk1.cli_exec("core set verbose 10")
-
         self.log_last_step("Originating call to begin test")
         self.asterisk1.cli_originate(
          "IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")

Modified: asterisk/team/pabelanger/configs/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/callparking/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/callparking/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/callparking/run-test Sat Nov 20 19:33:45 2010
@@ -138,10 +138,6 @@
     # 6.  userC dials 702 and retrieves userB
 
     def launch_test(self):
-        self.asterisk1.cli_exec("core set verbose 10")
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk3.cli_exec("core set verbose 10")
-
         self.log_last_step("Originating call to begin test")
         self.asterisk1.cli_originate(
          "IAX2/userA at 127.0.0.1:4571/b_exten extension bridge_to_A at parking")

Modified: asterisk/team/pabelanger/configs/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/directed_pickup/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/directed_pickup/run-test Sat Nov 20 19:33:45 2010
@@ -118,7 +118,6 @@
 
     def launch_test1(self):
         self.log_last_step("Starting Test 1")
-        self.asterisk1.cli_exec("core set verbose 10")
         if self.ast_version < AsteriskVersion("1.6.2"):
             self.asterisk1.cli_exec("originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
         else:
@@ -137,7 +136,6 @@
             self.test2 = SKIP
             reactor.callLater(2, self.shut_down)
         else:
-            self.asterisk1.cli_exec("core set verbose 10")
             self.asterisk1.cli_exec("channel originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
             reactor.callLater(2, self.test2_pickup)
 

Modified: asterisk/team/pabelanger/configs/tests/fastagi/channel-status/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/channel-status/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/channel-status/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/channel-status/run-test Sat Nov 20 19:33:45 2010
@@ -103,7 +103,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         # Set blocking=False so that we can test channel

Modified: asterisk/team/pabelanger/configs/tests/fastagi/connect/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/connect/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/connect/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/connect/run-test Sat Nov 20 19:33:45 2010
@@ -69,8 +69,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
-
         print "Originating call to begin test."
         self.asterisk.cli_originate(
             "Local/basic_agi at agitest extension echo at agitest"

Modified: asterisk/team/pabelanger/configs/tests/fastagi/control-stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/control-stream-file/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/control-stream-file/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/control-stream-file/run-test Sat Nov 20 19:33:45 2010
@@ -81,7 +81,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/database/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/database/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/database/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/database/run-test Sat Nov 20 19:33:45 2010
@@ -184,7 +184,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/execute/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/execute/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/execute/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/execute/run-test Sat Nov 20 19:33:45 2010
@@ -170,7 +170,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
         print "Originating call to begin test."
         self.asterisk.cli_originate(

Modified: asterisk/team/pabelanger/configs/tests/fastagi/get-data/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/get-data/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/get-data/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/get-data/run-test Sat Nov 20 19:33:45 2010
@@ -89,7 +89,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/hangup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/hangup/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/hangup/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/hangup/run-test Sat Nov 20 19:33:45 2010
@@ -108,7 +108,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/record-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/record-file/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/record-file/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/record-file/run-test Sat Nov 20 19:33:45 2010
@@ -128,7 +128,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
         print "Originating call to begin test which terminates recording",\
             "with", self.test

Modified: asterisk/team/pabelanger/configs/tests/fastagi/say-alpha/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/say-alpha/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/say-alpha/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/say-alpha/run-test Sat Nov 20 19:33:45 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/say-date/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/say-date/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/say-date/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/say-date/run-test Sat Nov 20 19:33:45 2010
@@ -92,7 +92,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/say-datetime/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/say-datetime/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/say-datetime/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/say-datetime/run-test Sat Nov 20 19:33:45 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/say-digits/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/say-digits/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/say-digits/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/say-digits/run-test Sat Nov 20 19:33:45 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/say-number/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/say-number/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/say-number/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/say-number/run-test Sat Nov 20 19:33:45 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/say-phonetic/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/say-phonetic/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/say-phonetic/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/say-phonetic/run-test Sat Nov 20 19:33:45 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/say-time/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/say-time/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/say-time/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/say-time/run-test Sat Nov 20 19:33:45 2010
@@ -92,7 +92,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/stream-file/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/stream-file/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/stream-file/run-test Sat Nov 20 19:33:45 2010
@@ -79,7 +79,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/fastagi/wait-for-digit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/fastagi/wait-for-digit/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/fastagi/wait-for-digit/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/fastagi/wait-for-digit/run-test Sat Nov 20 19:33:45 2010
@@ -85,7 +85,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/configs/tests/feature_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/feature_attended_transfer/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/feature_attended_transfer/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/feature_attended_transfer/run-test Sat Nov 20 19:33:45 2010
@@ -132,16 +132,12 @@
     # 7.  Audio and DTMF is passed and detected on each side of the call verifying the connection.
     # 8.  A and C report results to FastAGI and hangup.
     def launch_test(self):
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk1.cli_exec("core set verbose 10")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
             self.asterisk2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
         else:
             self.asterisk1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
             self.asterisk2.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
-
 
         self.log_last_step("Originating call to begin test 1")
         if self.ast_version < AsteriskVersion("1.6.2"):

Modified: asterisk/team/pabelanger/configs/tests/feature_blonde_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/feature_blonde_transfer/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/feature_blonde_transfer/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/feature_blonde_transfer/run-test Sat Nov 20 19:33:45 2010
@@ -113,9 +113,6 @@
     # 6.  A and C report results to FastAGI and hangup.
     def launch_test(self):
 
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk1.cli_exec("core set verbose 10")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
             self.asterisk2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)

Modified: asterisk/team/pabelanger/configs/tests/iax2/basic-call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/iax2/basic-call/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/iax2/basic-call/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/iax2/basic-call/run-test Sat Nov 20 19:33:45 2010
@@ -85,9 +85,6 @@
     def run(self):
         self.start_asterisk()
 
-        self.asterisk.cli_exec("core set verbose 10")
-        self.asterisk2.cli_exec("core set verbose 10")
-
         if self.ast_version < AsteriskVersion("1.6.0"):
             self.asterisk.cli_exec("iax2 set debug")
             self.asterisk2.cli_exec("iax2 set debug")

Modified: asterisk/team/pabelanger/configs/tests/manager/login/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/manager/login/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/manager/login/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/manager/login/run-test Sat Nov 20 19:33:45 2010
@@ -28,12 +28,7 @@
         reactor.callWhenRunning(self.run)
 
         print "Creating Asterisk instance ..."
-        ast_conf_options = {
-            "verbose" : "10",
-            "debug" : "3"
-        }
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/manager/login",
-                                 ast_conf_options=ast_conf_options)
+        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/manager/login")
         self.asterisk.install_configs("tests/manager/login/configs")
 
     def stop_reactor(self):

Modified: asterisk/team/pabelanger/configs/tests/mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/mixmonitor/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/mixmonitor/run-test Sat Nov 20 19:33:45 2010
@@ -94,9 +94,6 @@
         self.log_last_step("Starting Asterisk")
         self.asterisk.start()
 
-        self.asterisk.cli_exec("core set verbose 10")
-        self.asterisk.cli_exec("core set debug 3")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
             self.asterisk.cli_exec("core set global TESTAUDIO2 " + self.audiofile2)

Modified: asterisk/team/pabelanger/configs/tests/mixmonitor_audiohook_inherit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/mixmonitor_audiohook_inherit/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/mixmonitor_audiohook_inherit/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/mixmonitor_audiohook_inherit/run-test Sat Nov 20 19:33:45 2010
@@ -69,8 +69,6 @@
         self.log_last_step("Starting Asterisk")
         self.asterisk.start()
 
-        self.asterisk.cli_exec("core set verbose 10")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
             self.asterisk.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)

Modified: asterisk/team/pabelanger/configs/tests/one-step-parking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/configs/tests/one-step-parking/run-test?view=diff&rev=893&r1=892&r2=893
==============================================================================
--- asterisk/team/pabelanger/configs/tests/one-step-parking/run-test (original)
+++ asterisk/team/pabelanger/configs/tests/one-step-parking/run-test Sat Nov 20 19:33:45 2010
@@ -103,9 +103,6 @@
     # 3.  A gets parked
     # 4.  B calls 701 and retrieves A
     def launch_test(self):
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk1.cli_exec("core set verbose 10")
-
         self.log_last_step("Originating call to begin test")
         self.asterisk1.cli_originate(
          "IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")




More information about the asterisk-commits mailing list