[asterisk-commits] sgriepentrog: branch sgriepentrog/testsuite-vg2 r5005 - /asterisk/team/sgriep...

[SVN commits to the Asterisk project]

Author: sgriepentrog
Date: Mon Apr 28 19:39:04 2014
New Revision: 5005

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5005
Log:
testsuite: allow valgrind to run to completion on slow cpus

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

Modified: asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/asterisk.py?view=diff&rev=5005&r1=5004&r2=5005
==============================================================================
--- asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/asterisk.py Mon Apr 28 19:39:04 2014
@@ -317,7 +317,9 @@
         def __wait_fully_booted_error(cli_command):
             """Errback for CLI command waitfullybooted"""
 
-            wait_time = 25 if self.valgrind.enable else 5
+            wait_time = 5
+            if self.valgrind.enable:
+                wait_time *= self.valgrind.multiplier
             if time.time() - self.__start_asterisk_time > wait_time:
                 msg = "Asterisk core waitfullybooted for %s failed" % self.host 
                 LOGGER.error(msg)
@@ -446,7 +448,9 @@
         else:
             # Schedule a kill. If we don't gracefully shut down Asterisk, this
             # will ensure that the test is stopped.
-            secs = 90 if self.valgrind.enable else 10
+            secs = 10
+            if self.valgrind.enable:
+                secs *= self.valgrind.multiplier
             self._stop_cancel_tokens.append(reactor.callLater(secs, __send_kill))
 
             # Start by asking to stop gracefully.

Modified: asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/valgrind.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/valgrind.py?view=diff&rev=5005&r1=5004&r2=5005
==============================================================================
--- asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/valgrind.py (original)
+++ asterisk/team/sgriepentrog/testsuite-vg2/lib/python/asterisk/valgrind.py Mon Apr 28 19:39:04 2014
@@ -47,6 +47,7 @@
         self._log_filename = ""
         self._xml_filename = ""
         self._use_xml_log = True
+        self.multiplier = 20
 
         self.enable = test_config.valgrind or os.getenv("VALGRIND") == "true"