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

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri Sep  9 08:11:03 2011
New Revision: 2111

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2111
Log:
Allow tests to not timeout if they so choose (check_voicemail_nominal takes 
an order of magnitude longer to run on bamboo then in trial runs)

Modified:
    asterisk/trunk/lib/python/asterisk/TestCase.py
    asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test

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=2111&r1=2110&r2=2111
==============================================================================
--- asterisk/trunk/lib/python/asterisk/TestCase.py (original)
+++ asterisk/trunk/lib/python/asterisk/TestCase.py Fri Sep  9 08:11:03 2011
@@ -118,7 +118,8 @@
         """
 
         """
-        reactor.callLater(self.reactor_timeout, self.stop_reactor)
+        if (self.reactor_timeout > 0):
+            reactor.callLater(self.reactor_timeout, self.stop_reactor)
 
     def ami_login_error(self, ami):
         logger.error("Error logging into AMI")

Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test?view=diff&rev=2111&r1=2110&r2=2111
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test Fri Sep  9 08:11:03 2011
@@ -295,7 +295,8 @@
             return False
         self.addTestCondition("savedMessages", TestCondition(checkSavedMessages, 0))
 
-        self.reactor_timeout = 240
+        """ Force this test not to timeout.  On bamboo, this test can take a *very* long time """
+        self.reactor_timeout = 0
         self.create_asterisk(2)
 
     def ami_connect(self, ami):