Bug 1136700 - enable tweaking of the maximum number of timeouts for mochitests; r=jmaher

When running tests locally, it's occasionally useful to be able to
increase the number of tests permitted to timeout before declaring the
test run a failure.  This patch adds the necessary bits to SimpleTest
and the appropriate amount of plumbing to runtests.py and mach to make
that so.

testing/mochitest/mach_commands.py

@@ -256,6 +256,7 @@ class MochitestRunner(MozbuildObject):
             runByDir=False,
             useTestMediaDevices=False,
             timeout=None,
+            max_timeouts=None,
             **kwargs):
         """Runs a mochitest.
 
@@ -393,6 +394,8 @@ class MochitestRunner(MozbuildObject):
         options.useTestMediaDevices = useTestMediaDevices
         if timeout:
             options.timeout = int(timeout)
+        if max_timeouts:
+            options.maxTimeouts = int(max_timeouts)
 
         options.failureFile = failure_file_path
         if install_extension is not None:
@@ -729,6 +732,10 @@ def MochitestCommand(func):
         help='The per-test timeout time in seconds (default: 60 seconds)')
     func = timeout(func)
 
+    max_timeouts = CommandArgument('--max-timeouts', default=None,
+        help='The maximum number of timeouts permitted before halting testing')
+    func = max_timeouts(func)
+
     return func
 
 

testing/mochitest/mochitest_options.py

@@ -478,6 +478,12 @@ class MochitestOptions(optparse.OptionParser):
           "dest": "debuggerInteractive",
           "help": "prevents the test harness from redirecting stdout and stderr for interactive debuggers",
           }],
+        [["--max-timeouts"],
+         { "type": "int",
+           "dest": "maxTimeouts",
+           "help": "maximum number of timeouts permitted before halting testing",
+           "default": None,
+           }],
     ]
 
     def __init__(self, **kwargs):

testing/mochitest/runtests.py

@@ -592,6 +592,8 @@ class MochitestUtilsMixin(object):
                 self.urlOpts.append("autorun=1")
             if options.timeout:
                 self.urlOpts.append("timeout=%d" % options.timeout)
+            if options.maxTimeouts:
+                self.urlOpts.append("maxTimeouts=%d" % options.maxTimeouts)
             if options.closeWhenDone:
                 self.urlOpts.append("closeWhenDone=1")
             if options.webapprtContent:

testing/mochitest/tests/SimpleTest/setup.js

@@ -146,6 +146,10 @@ if (params.interactiveDebugger) {
   TestRunner.structuredLogger.interactiveDebugger = true;
 }
 
+if (params.maxTimeouts) {
+  TestRunner.maxTimeouts = params.maxTimeouts;
+}
+
 // Log things to the console if appropriate.
 TestRunner.logger.addListener("dumpListener", consoleLevel + "", function(msg) {
   dump(msg.info.join(' ') + "\n");