[asterisk-commits] mjordan: testsuite/asterisk/trunk r2222 - in /asterisk/trunk: lib/python/aste...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Sep 14 15:22:54 2011
New Revision: 2222

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2222
Log:
Readded flag to not disabling existing loggers in fileConfig.  Changed
timing in check_voicemail_new_user to better aid in debugging issues on BSD.

Modified:
    asterisk/trunk/lib/python/asterisk/TestCase.py
    asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/extensions.conf

Modified: asterisk/trunk/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/TestCase.py?view=diff&rev=2222&r1=2221&r2=2222
==============================================================================
--- asterisk/trunk/lib/python/asterisk/TestCase.py (original)
+++ asterisk/trunk/lib/python/asterisk/TestCase.py Wed Sep 14 15:22:54 2011
@@ -52,7 +52,7 @@
         """ Set up logging """
         logConfigFile = os.path.join(os.getcwd(), "%s" % (self.defaultLogFileName))
         if os.path.exists(logConfigFile):
-            logging.config.fileConfig(logConfigFile)
+            logging.config.fileConfig(logConfigFile, None, False)
         else:
             print "WARNING: no logging.conf file found; using default configuration"
             logging.basicConfig(level=self.defaultLogLevel)

Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/extensions.conf?view=diff&rev=2222&r1=2221&r2=2222
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/extensions.conf Wed Sep 14 15:22:54 2011
@@ -8,7 +8,6 @@
 exten => 8052,1,NoOp()
 	same => n,VoiceMailMain()
 	same => n,UserEvent(TestResult,result: pass,status: successfully exited VoiceMailMain)
-	same => n,Wait(1)
 	same => n,Hangup()
 
 exten => o,1,UserEvent(TestResult,result: fail,status: failed to exit successfully through '#' key)