[asterisk-commits] mnicholson: testsuite/asterisk/trunk r385 - in /asterisk/trunk/tests/cdr/app_...

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Jun  9 17:08:19 2010
New Revision: 385

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=385
Log:
Load a custom modules.conf in an attempt to make the test pass on 1.4

Added:
    asterisk/trunk/tests/cdr/app_queue/configs/modules.conf   (with props)
Modified:
    asterisk/trunk/tests/cdr/app_queue/test.lua

Added: asterisk/trunk/tests/cdr/app_queue/configs/modules.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_queue/configs/modules.conf?view=auto&rev=385
==============================================================================
--- asterisk/trunk/tests/cdr/app_queue/configs/modules.conf (added)
+++ asterisk/trunk/tests/cdr/app_queue/configs/modules.conf Wed Jun  9 17:08:19 2010
@@ -1,0 +1,11 @@
+
+[modules]
+autoload=yes
+load => res_musiconhold.so
+load => chan_sip.so
+load => app_queue.so
+
+noload => pbx_gtkconsole.so
+noload => chan_alsa.so
+noload => chan_oss.so
+noload => chan_console.so

Propchange: asterisk/trunk/tests/cdr/app_queue/configs/modules.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/trunk/tests/cdr/app_queue/configs/modules.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/trunk/tests/cdr/app_queue/configs/modules.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: asterisk/trunk/tests/cdr/app_queue/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_queue/test.lua?view=diff&rev=385&r1=384&r2=385
==============================================================================
--- asterisk/trunk/tests/cdr/app_queue/test.lua (original)
+++ asterisk/trunk/tests/cdr/app_queue/test.lua Wed Jun  9 17:08:19 2010
@@ -124,9 +124,9 @@
 a:load_config("configs/cdr.conf")
 a:load_config("configs/queues.conf")
 
-a:generate_asterisk_conf()
-a["asterisk.conf"]["options"]["verbose"] = 10
-a["asterisk.conf"]["options"]["debug"] = 10
+if ast.has_major_version("1.4") then
+	a:load_config("configs/modules.conf")
+end
 
 a:spawn()