[svn-commits] sgriepentrog: branch sgriepentrog/testsuite-valgrind r4369 - /asterisk/team/s...

[SVN commits to the Digium repositories]

Author: sgriepentrog
Date: Mon Nov 25 17:07:55 2013
New Revision: 4369

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4369
Log:
Fix for ami early startup / waitfullybooted not working

Modified:
    asterisk/team/sgriepentrog/testsuite-valgrind/lib/python/asterisk/asterisk.py

Modified: asterisk/team/sgriepentrog/testsuite-valgrind/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/sgriepentrog/testsuite-valgrind/lib/python/asterisk/asterisk.py?view=diff&rev=4369&r1=4368&r2=4369
==============================================================================
--- asterisk/team/sgriepentrog/testsuite-valgrind/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/sgriepentrog/testsuite-valgrind/lib/python/asterisk/asterisk.py Mon Nov 25 17:07:55 2013
@@ -282,7 +282,12 @@
 
         def __wait_fully_booted_callback(cli_command):
             """ Callback for CLI command waitfullybooted """
-            self.__start_deferred.callback("Successfully started Asterisk %s" % self.host)
+            logger.debug("result from core waitfullybooted = %s" % cli_command.output)
+            if "Asterisk has fully booted" in cli_command.output:
+                self.__start_deferred.callback("Successfully started Asterisk %s" % self.host)
+            else:
+                logger.debug("Asterisk core waitfullybooted failed (wrong output), attempting again...")
+                reactor.callLater(1, __execute_wait_fully_booted)
 
         def __wait_fully_booted_error(cli_command):
             """ Errback for CLI command waitfullybooted """