[asterisk-commits] pabelanger: testsuite/asterisk/trunk r868 - in /asterisk/trunk: lib/python/as...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Nov 19 09:46:43 CST 2010
Author: pabelanger
Date: Fri Nov 19 09:46:38 2010
New Revision: 868
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=868
Log:
Create a default logger.conf for all tests.
Currently each test defines their logger.conf ability, making logging
inconsistence across all tests. With this path we define a default logger.conf
the testsuite will use. If tests require additional logger settings, simply
create a 'logger.conf.inc' file which will be included by 'logger.conf'
Additionally, convert tests to use install_configs()
Review: https://reviewboard.asterisk.org/r/1022/
Modified:
asterisk/trunk/lib/python/asterisk/asterisk.py
asterisk/trunk/tests/cdr/cdr_unanswered_yes/configs/logger.conf
asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test
asterisk/trunk/tests/cdr/cdr_userfield/configs/logger.conf
asterisk/trunk/tests/cdr/cdr_userfield/run-test
asterisk/trunk/tests/cdr/console_dial_sip_answer/configs_common/logger.conf
asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test
asterisk/trunk/tests/cdr/console_dial_sip_busy/configs_common/logger.conf
asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test
asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs_common/logger.conf
asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test
asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs_common/logger.conf
asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test
asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs_common/logger.conf
asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test
asterisk/trunk/tests/cdr/console_fork_before_dial/configs_common/logger.conf
asterisk/trunk/tests/cdr/console_fork_before_dial/run-test
asterisk/trunk/tests/cdr/nocdr/configs/logger.conf
asterisk/trunk/tests/cdr/nocdr/run-test
asterisk/trunk/tests/chanspy/chanspy_barge/run-test
asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test
asterisk/trunk/tests/directed_pickup/run-test
asterisk/trunk/tests/fastagi/configs/logger.conf
asterisk/trunk/tests/feature_attended_transfer/configs/logger.conf
asterisk/trunk/tests/feature_attended_transfer/configs2/logger.conf
asterisk/trunk/tests/feature_attended_transfer/run-test
asterisk/trunk/tests/feature_blonde_transfer/run-test
asterisk/trunk/tests/iax2/basic-call/configs/logger.conf
asterisk/trunk/tests/iax2/basic-call/configs2/logger.conf
asterisk/trunk/tests/manager/event-monitor/configs/logger.conf
asterisk/trunk/tests/manager/event-monitor/run-test
asterisk/trunk/tests/manager/login/configs/logger.conf
asterisk/trunk/tests/manager/login/run-test
asterisk/trunk/tests/mixmonitor/run-test
asterisk/trunk/tests/mixmonitor_audiohook_inherit/run-test
asterisk/trunk/tests/pbx/call-files/run-test
asterisk/trunk/tests/sip_attended_transfer/run-test
asterisk/trunk/tests/sip_attended_transfer_tcp/run-test
asterisk/trunk/tests/sip_attended_transfer_v6/run-test
asterisk/trunk/tests/sip_one_legged_transfer/run-test
asterisk/trunk/tests/sip_one_legged_transfer_v6/run-test
asterisk/trunk/tests/udptl/configs1/logger.conf
asterisk/trunk/tests/udptl/configs2/logger.conf
asterisk/trunk/tests/udptl/run-test
asterisk/trunk/tests/udptl_v6/configs1/logger.conf
asterisk/trunk/tests/udptl_v6/configs2/logger.conf
asterisk/trunk/tests/udptl_v6/run-test
Modified: asterisk/trunk/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/asterisk.py?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/lib/python/asterisk/asterisk.py (original)
+++ asterisk/trunk/lib/python/asterisk/asterisk.py Fri Nov 19 09:46:38 2010
@@ -99,6 +99,8 @@
self.__gen_ast_conf(ast_conf, dir_cat, ast_conf_options)
for (var, val) in dir_cat.options:
self.__mirror_dir(var, val)
+
+ self.install_configs(os.getcwd() + "/tests/configs")
def start(self):
"""Start this instance of Asterisk.
Modified: asterisk/trunk/tests/cdr/cdr_unanswered_yes/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_unanswered_yes/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_unanswered_yes/configs/logger.conf (original)
+++ asterisk/trunk/tests/cdr/cdr_unanswered_yes/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test (original)
+++ asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test Fri Nov 19 09:46:38 2010
@@ -27,10 +27,7 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs/logger.conf" % (testdir))
- asterisk1.install_config("%s/configs/cdr.conf" % (testdir))
+ asterisk1.install_configs("%s/configs" % (testdir))
asterisk1.start()
self.asterisk1 = asterisk1
Modified: asterisk/trunk/tests/cdr/cdr_userfield/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_userfield/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_userfield/configs/logger.conf (original)
+++ asterisk/trunk/tests/cdr/cdr_userfield/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/cdr_userfield/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_userfield/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_userfield/run-test (original)
+++ asterisk/trunk/tests/cdr/cdr_userfield/run-test Fri Nov 19 09:46:38 2010
@@ -27,10 +27,7 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs/logger.conf" % (testdir))
- asterisk1.install_config("%s/configs/cdr.conf" % (testdir))
+ asterisk1.install_configs("%s/configs" % (testdir))
asterisk1.start()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_answer/configs_common/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_answer/configs_common/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_answer/configs_common/logger.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_answer/configs_common/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test Fri Nov 19 09:46:38 2010
@@ -27,16 +27,10 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs1/sip.conf" % (testdir))
- asterisk1.install_config("%s/configs1/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs1/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk1.install_configs("%s/configs1" % (testdir))
asterisk2 = Asterisk(base=workingdir)
- asterisk2.install_config("%s/configs2/sip.conf" % (testdir))
- asterisk2.install_config("%s/configs2/extensions.conf" % (testdir))
-
- asterisk2.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk2.install_configs("%s/configs2" % (testdir))
asterisk1.start()
asterisk2.start()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_busy/configs_common/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_busy/configs_common/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_busy/configs_common/logger.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_busy/configs_common/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test Fri Nov 19 09:46:38 2010
@@ -27,16 +27,10 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs1/sip.conf" % (testdir))
- asterisk1.install_config("%s/configs1/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs1/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk1.install_configs("%s/configs1" % (testdir))
asterisk2 = Asterisk(base=workingdir)
- asterisk2.install_config("%s/configs2/sip.conf" % (testdir))
- asterisk2.install_config("%s/configs2/extensions.conf" % (testdir))
-
- asterisk2.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk2.install_configs("%s/configs2" % (testdir))
asterisk1.start()
asterisk2.start()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs_common/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs_common/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs_common/logger.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs_common/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test Fri Nov 19 09:46:38 2010
@@ -27,16 +27,10 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs1/sip.conf" % (testdir))
- asterisk1.install_config("%s/configs1/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs1/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk1.install_configs("%s/configs1" % (testdir))
asterisk2 = Asterisk(base=workingdir)
- asterisk2.install_config("%s/configs2/sip.conf" % (testdir))
- asterisk2.install_config("%s/configs2/extensions.conf" % (testdir))
-
- asterisk2.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk2.install_configs("%s/configs2" % (testdir))
asterisk1.start()
asterisk2.start()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs_common/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs_common/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs_common/logger.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs_common/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test Fri Nov 19 09:46:38 2010
@@ -27,16 +27,10 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs1/sip.conf" % (testdir))
- asterisk1.install_config("%s/configs1/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs1/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk1.install_configs("%s/configs1" % (testdir))
asterisk2 = Asterisk(base=workingdir)
- asterisk2.install_config("%s/configs2/sip.conf" % (testdir))
- asterisk2.install_config("%s/configs2/extensions.conf" % (testdir))
-
- asterisk2.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk2.install_configs("%s/configs2" % (testdir))
asterisk1.start()
asterisk2.start()
Modified: asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs_common/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs_common/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs_common/logger.conf (original)
+++ asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs_common/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test (original)
+++ asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test Fri Nov 19 09:46:38 2010
@@ -27,16 +27,10 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs1/sip.conf" % (testdir))
- asterisk1.install_config("%s/configs1/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs1/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk1.install_configs("%s/configs1" % (testdir))
asterisk2 = Asterisk(base=workingdir)
- asterisk2.install_config("%s/configs2/sip.conf" % (testdir))
- asterisk2.install_config("%s/configs2/extensions.conf" % (testdir))
-
- asterisk2.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk2.install_configs("%s/configs2" % (testdir))
asterisk1.start()
asterisk2.start()
Modified: asterisk/trunk/tests/cdr/console_fork_before_dial/configs_common/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_before_dial/configs_common/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_before_dial/configs_common/logger.conf (original)
+++ asterisk/trunk/tests/cdr/console_fork_before_dial/configs_common/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/console_fork_before_dial/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_before_dial/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_before_dial/run-test (original)
+++ asterisk/trunk/tests/cdr/console_fork_before_dial/run-test Fri Nov 19 09:46:38 2010
@@ -27,16 +27,10 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs1/sip.conf" % (testdir))
- asterisk1.install_config("%s/configs1/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs1/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk1.install_configs("%s/configs1" % (testdir))
asterisk2 = Asterisk(base=workingdir)
- asterisk2.install_config("%s/configs2/sip.conf" % (testdir))
- asterisk2.install_config("%s/configs2/extensions.conf" % (testdir))
-
- asterisk2.install_config("%s/configs_common/logger.conf" % (testdir))
+ asterisk2.install_configs("%s/configs2" % (testdir))
asterisk1.start()
asterisk2.start()
Modified: asterisk/trunk/tests/cdr/nocdr/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/nocdr/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/nocdr/configs/logger.conf (original)
+++ asterisk/trunk/tests/cdr/nocdr/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,11 +1,0 @@
-[general]
-[logfiles]
-;console => notice,warning,error
-;console => notice,warning,error,debug
-;messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/cdr/nocdr/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/nocdr/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/cdr/nocdr/run-test (original)
+++ asterisk/trunk/tests/cdr/nocdr/run-test Fri Nov 19 09:46:38 2010
@@ -27,10 +27,7 @@
reactor.callLater(60, self.abort)
asterisk1 = Asterisk(base=workingdir)
- asterisk1.install_config("%s/configs/extensions.conf" % (testdir))
- asterisk1.install_config("%s/configs/manager.conf" % (testdir))
- asterisk1.install_config("%s/configs/logger.conf" % (testdir))
- asterisk1.install_config("%s/configs/cdr.conf" % (testdir))
+ asterisk1.install_configs("%s/configs" % (testdir))
asterisk1.start()
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=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/trunk/tests/chanspy/chanspy_barge/run-test Fri Nov 19 09:46:38 2010
@@ -49,9 +49,7 @@
self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/chanspy/chanspy_barge",
ast_conf_options=ast_conf_options)
- self.asterisk.install_config("tests/chanspy/chanspy_barge/configs/extensions.conf")
- self.asterisk.install_config("tests/chanspy/chanspy_barge/configs/sip.conf")
- self.asterisk.install_config("tests/chanspy/chanspy_barge/configs/manager.conf")
+ self.asterisk.install_configs("tests/chanspy/chanspy_barge/configs")
self.talkingaudio = os.path.join(os.getcwd(), "tests/chanspy/chanspy_barge/sounds/talking")
self.audiofile1 = os.path.join(os.getcwd(), "tests/chanspy/chanspy_barge/testaudio1")
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=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test (original)
+++ asterisk/trunk/tests/chanspy/chanspy_w_mixmonitor/run-test Fri Nov 19 09:46:38 2010
@@ -43,9 +43,7 @@
print self.ast_version
self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/chanspy/chanspy_w_mixmonitor")
- self.asterisk.install_config("tests/chanspy/chanspy_w_mixmonitor/configs/extensions.conf")
- self.asterisk.install_config("tests/chanspy/chanspy_w_mixmonitor/configs/sip.conf")
- self.asterisk.install_config("tests/chanspy/chanspy_w_mixmonitor/configs/manager.conf")
+ self.asterisk.install_configs("tests/chanspy/chanspy_w_mixmonitor/configs")
self.talkingaudio = os.path.join(os.getcwd(), "tests/chanspy/chanspy_w_mixmonitor/sounds/talking")
self.audiofile1 = os.path.join(os.getcwd(), "tests/chanspy/chanspy_w_mixmonitor/testaudio1")
Modified: asterisk/trunk/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/directed_pickup/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/directed_pickup/run-test (original)
+++ asterisk/trunk/tests/directed_pickup/run-test Fri Nov 19 09:46:38 2010
@@ -52,8 +52,7 @@
print self.ast_version
self.asterisk1 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/directed_pickup"))
- self.asterisk1.install_config("tests/directed_pickup/configs/extensions.conf")
- self.asterisk1.install_config("tests/directed_pickup/configs/iax.conf")
+ self.asterisk1.install_configs("tests/directed_pickup/configs")
def shut_down(self):
self.log_last_step("Reading results")
Modified: asterisk/trunk/tests/fastagi/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/fastagi/configs/logger.conf (original)
+++ asterisk/trunk/tests/fastagi/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,105 +1,0 @@
-;
-; Logging Configuration
-;
-; In this file, you configure logging to files or to
-; the syslog system.
-;
-; "logger reload" at the CLI will reload configuration
-; of the logging system.
-
-[general]
-;
-; Customize the display of debug message time stamps
-; this example is the ISO 8601 date format (yyyy-mm-dd HH:MM:SS)
-;
-; see strftime(3) Linux manual for format specifiers. Note that there is also
-; a fractional second parameter which may be used in this field. Use %1q
-; for tenths, %2q for hundredths, etc.
-;
-;dateformat=%F %T ; ISO 8601 date format
-;dateformat=%F %T.%3q ; with milliseconds
-;
-; This appends the hostname to the name of the log files.
-;appendhostname = yes
-;
-; This determines whether or not we log queue events to a file
-; (defaults to yes).
-;queue_log = no
-;
-; Set the queue_log filename
-; (defaults to queue_log)
-;queue_log_name = queue_log
-;
-; Log rotation strategy:
-; sequential: Rename archived logs in order, such that the newest
-; has the highest sequence number [default].
-; rotate: Rotate all the old files, such that the oldest has the
-; highest sequence number [this is the expected behavior
-; for Unix administrators].
-; timestamp: Rename the logfiles using a timestamp instead of a
-; sequence number when "logger rotate" is executed.
-;rotatestrategy = rotate
-;
-; Run a system command after rotating the files. This is mainly
-; useful for rotatestrategy=rotate. The example allows the last
-; two archive files to remain uncompressed, but after that point,
-; they are compressed on disk.
-;
-; exec_after_rotate=gzip -9 ${filename}.2
-;
-;
-; For each file, specify what to log.
-;
-; For console logging, you set options at start of
-; Asterisk with -v for verbose and -d for debug
-; See 'asterisk -h' for more information.
-;
-; Directory for log files is configures in asterisk.conf
-; option astlogdir
-;
-[logfiles]
-;
-; Format is "filename" and then "levels" of debugging to be included:
-; debug
-; notice
-; warning
-; error
-; verbose
-; dtmf
-;
-; Special filename "console" represents the system console
-;
-; Filenames can either be relative to the standard Asterisk log directory
-; (see 'astlogdir' in asterisk.conf), or absolute paths that begin with
-; '/'.
-;
-; Special level name "*" means all levels, even dynamic levels registered
-; by modules after the logger has been initialized (this means that loading
-; and unloading modules that create/remove dynamic logger levels will result
-; in these levels being included on filenames that have a level name of "*",
-; without any need to perform a 'logger reload' or similar operation). Note
-; that there is no value in specifying both "*" and specific level names for
-; a filename; the "*" level means all levels, and the remaining level names
-; will be ignored.
-;
-; We highly recommend that you DO NOT turn on debug mode if you are simply
-; running a production system. Debug mode turns on a LOT of extra messages,
-; most of which you are unlikely to understand without an understanding of
-; the underlying code. Do NOT report debug messages as code issues, unless
-; you have a specific issue that you are attempting to debug. They are
-; messages for just that -- debugging -- and do not rise to the level of
-; something that merit your attention as an Asterisk administrator. Debug
-; messages are also very verbose and can and do fill up logfiles quickly;
-; this is another reason not to have debug mode on a production system unless
-; you are in the process of debugging a specific issue.
-;
-;debug => debug
-console => notice,warning,error
-;console => notice,warning,error,debug
-messages => notice,warning,error
-full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/feature_attended_transfer/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/feature_attended_transfer/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/feature_attended_transfer/configs/logger.conf (original)
+++ asterisk/trunk/tests/feature_attended_transfer/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,32 +1,0 @@
-;
-; Logging Configuration
-;
-; In this file, you configure logging to files or to
-; the syslog system.
-;
-; "logger reload" at the CLI will reload configuration
-; of the logging system.
-
-[general]
-[logfiles]
-;
-; Format is "filename" and then "levels" of debugging to be included:
-; debug
-; notice
-; warning
-; error
-; verbose
-; dtmf
-;
-; Special filename "console" represents the system console
-;
-;debug => debug
-console => notice,warning,error,debug,verbose,dtmf
-;console => notice,warning,error,debug
-messages => notice,warning,error,debug,verbose,dtmf
-;full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/feature_attended_transfer/configs2/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/feature_attended_transfer/configs2/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/feature_attended_transfer/configs2/logger.conf (original)
+++ asterisk/trunk/tests/feature_attended_transfer/configs2/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,32 +1,0 @@
-;
-; Logging Configuration
-;
-; In this file, you configure logging to files or to
-; the syslog system.
-;
-; "logger reload" at the CLI will reload configuration
-; of the logging system.
-
-[general]
-[logfiles]
-;
-; Format is "filename" and then "levels" of debugging to be included:
-; debug
-; notice
-; warning
-; error
-; verbose
-; dtmf
-;
-; Special filename "console" represents the system console
-;
-;debug => debug
-console => notice,warning,error,debug,verbose,dtmf
-;console => notice,warning,error,debug
-messages => notice,warning,error,debug,verbose,dtmf
-;full => notice,warning,error,debug,verbose
-
-;syslog keyword : This special keyword logs to syslog facility
-;
-;syslog.local0 => notice,warning,error
-;
Modified: asterisk/trunk/tests/feature_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/feature_attended_transfer/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/feature_attended_transfer/run-test (original)
+++ asterisk/trunk/tests/feature_attended_transfer/run-test Fri Nov 19 09:46:38 2010
@@ -50,17 +50,10 @@
print self.ast_version
self.asterisk1 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_attended_transfer"))
- self.asterisk1.install_config("tests/feature_attended_transfer/configs/extensions.conf")
- self.asterisk1.install_config("tests/feature_attended_transfer/configs/iax.conf")
- self.asterisk1.install_config("tests/feature_attended_transfer/configs/manager.conf")
- self.asterisk1.install_config("tests/feature_attended_transfer/configs/logger.conf")
+ self.asterisk1.install_configs("tests/feature_attended_transfer/configs")
self.asterisk2 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_attended_transfer"))
- self.asterisk2.install_config("tests/feature_attended_transfer/configs2/extensions.conf")
- self.asterisk2.install_config("tests/feature_attended_transfer/configs2/features.conf")
- self.asterisk2.install_config("tests/feature_attended_transfer/configs2/iax.conf")
- self.asterisk2.install_config("tests/feature_attended_transfer/configs2/manager.conf")
- self.asterisk2.install_config("tests/feature_attended_transfer/configs2/logger.conf")
+ self.asterisk2.install_configs("tests/feature_attended_transfer/configs2")
self.talkingaudio = os.path.join(os.getcwd(), "tests/feature_attended_transfer/sounds/talking")
Modified: asterisk/trunk/tests/feature_blonde_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/feature_blonde_transfer/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/feature_blonde_transfer/run-test (original)
+++ asterisk/trunk/tests/feature_blonde_transfer/run-test Fri Nov 19 09:46:38 2010
@@ -46,15 +46,10 @@
print self.ast_version
self.asterisk1 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_blonde_transfer"))
- self.asterisk1.install_config("tests/feature_blonde_transfer/blonde_configs/extensions.conf")
- self.asterisk1.install_config("tests/feature_blonde_transfer/blonde_configs/iax.conf")
- self.asterisk1.install_config("tests/feature_blonde_transfer/blonde_configs/manager.conf")
+ self.asterisk1.install_configs("tests/feature_blonde_transfer/blonde_configs")
self.asterisk2 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/feature_blonde_transfer"))
- self.asterisk2.install_config("tests/feature_blonde_transfer/blonde_configs2/extensions.conf")
- self.asterisk2.install_config("tests/feature_blonde_transfer/blonde_configs2/features.conf")
- self.asterisk2.install_config("tests/feature_blonde_transfer/blonde_configs2/iax.conf")
- self.asterisk2.install_config("tests/feature_blonde_transfer/blonde_configs2/manager.conf")
+ self.asterisk2.install_configs("tests/feature_blonde_transfer/blonde_configs2")
self.talkingaudio = os.path.join(os.getcwd(), "tests/feature_blonde_transfer/sounds/talking")
Modified: asterisk/trunk/tests/iax2/basic-call/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/iax2/basic-call/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/iax2/basic-call/configs/logger.conf (original)
+++ asterisk/trunk/tests/iax2/basic-call/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,8 +1,0 @@
-[general]
-
-[logfiles]
-
-console =>
-;console => notice,warning,error,debug
-messages => notice,warning,error
-full => notice,warning,error,debug,verbose
Modified: asterisk/trunk/tests/iax2/basic-call/configs2/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/iax2/basic-call/configs2/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/iax2/basic-call/configs2/logger.conf (original)
+++ asterisk/trunk/tests/iax2/basic-call/configs2/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,8 +1,0 @@
-[general]
-
-[logfiles]
-
-console =>
-;console => notice,warning,error,debug
-messages => notice,warning,error
-full => notice,warning,error,debug,verbose
Modified: asterisk/trunk/tests/manager/event-monitor/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/event-monitor/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/manager/event-monitor/configs/logger.conf (original)
+++ asterisk/trunk/tests/manager/event-monitor/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,7 +1,0 @@
-[general]
-
-[logfiles]
-
-console =>
-messages => notice,warning,error
-full => notice,warning,error,debug,verbose
Modified: asterisk/trunk/tests/manager/event-monitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/event-monitor/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/manager/event-monitor/run-test (original)
+++ asterisk/trunk/tests/manager/event-monitor/run-test Fri Nov 19 09:46:38 2010
@@ -44,8 +44,7 @@
working_dir = os.path.dirname(argv[0])
asterisk = Asterisk(base="/tmp/asterisk-testsuite/manager/event-monitor")
- asterisk.install_config("tests/manager/event-monitor/configs/manager.conf")
- asterisk.install_config("tests/manager/event-monitor/configs/logger.conf")
+ asterisk.install_configs("tests/manager/event-monitor/configs")
logging.basicConfig()
import client
Modified: asterisk/trunk/tests/manager/login/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/login/configs/logger.conf?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/manager/login/configs/logger.conf (original)
+++ asterisk/trunk/tests/manager/login/configs/logger.conf Fri Nov 19 09:46:38 2010
@@ -1,7 +1,0 @@
-[general]
-
-[logfiles]
-
-console =>
-messages => notice,warning,error
-full => notice,warning,error,debug,verbose
Modified: asterisk/trunk/tests/manager/login/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/login/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
--- asterisk/trunk/tests/manager/login/run-test (original)
+++ asterisk/trunk/tests/manager/login/run-test Fri Nov 19 09:46:38 2010
@@ -34,8 +34,7 @@
}
self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/manager/login",
ast_conf_options=ast_conf_options)
- self.asterisk.install_config("tests/manager/login/configs/manager.conf")
- self.asterisk.install_config("tests/manager/login/configs/logger.conf")
+ self.asterisk.install_configs("tests/manager/login/configs")
def stop_reactor(self):
print "Stopping Reactor ..."
Modified: asterisk/trunk/tests/mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/mixmonitor/run-test?view=diff&rev=868&r1=867&r2=868
==============================================================================
[... 229 lines stripped ...]
More information about the asterisk-commits
mailing list