Correctly set the timeout of tests when using selenium

tools/testing/dart/test_runner.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Classes and methods for executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 952 matching lines @@
         field = new StringBuffer();
         continue;
       }
       field.write(c);
     }
     result.add(field.toString());
     return result;
   }
 }
 
+
+/** Modifies the --timeout=XX parameter passed to run_selenium.py */
+List<String> _modifySeleniumTimeout(List<String> arguments, int timeout) {
+  return arguments.map((argument) {
+    if (argument.startsWith('--timeout=')) {
+      return "--timeout=$timeout";
+    } else {
+      return argument;
+    }
+  }).toList();
+  return;
+}
+
+
 /**
  * A RunningProcess actually runs a test, getting the command lines from
  * its [TestCase], starting the test process (and first, a compilation
  * process if the TestCase is a [BrowserTestCase]), creating a timeout
  * timer, and recording the results in a new [CommandOutput] object, which it
  * attaches to the TestCase.  The lifetime of the RunningProcess is limited
  * to the time it takes to start the process, run the process, and record
  * the result; there are no pointers to it, so it should be available to
  * be garbage collected as soon as it is done.
  */
@@ skipping 21 matching lines @@
     return completer.future;
   }
 
   void _runCommand() {
     command.outputIsUpToDate.then((bool isUpToDate) {
       if (isUpToDate) {
         compilationSkipped = true;
         _commandComplete(0);
       } else {
         var processOptions = _createProcessOptions();
+        var commandArguments = _modifySeleniumTimeout(command.arguments,
+                                                      testCase.timeout);
         Future processFuture = io.Process.start(command.executable,
-                                                command.arguments,
+                                                commandArguments,
                                                 processOptions);
         processFuture.then((io.Process process) {
           // Close stdin so that tests that try to block on input will fail.
           process.stdin.close();
           void timeoutHandler() {
             timedOut = true;
             if (process != null) {
               process.kill();
             }
           }
@@ skipping 144 matching lines @@
     _stdoutCompleter = new Completer();
     _stderrCompleter = new Completer();
     _timer = new Timer(new Duration(seconds: testCase.timeout),
                        _timeoutHandler);
 
     if (testCase.commands.last.environment != null) {
       print("Warning: command.environment != null, but we don't support custom "
             "environments for batch runner tests!");
     }
 
-    var line = _createArgumentsLine(testCase.batchTestArguments);
+    var line = _createArgumentsLine(testCase.batchTestArguments,
+                                    testCase.timeout);
     _process.stdin.write(line);
     _stdoutSubscription.resume();
     _stderrSubscription.resume();
     Future.wait([_stdoutCompleter.future,
                  _stderrCompleter.future]).then((_) => _reportResult());
   }
 
-  String _createArgumentsLine(List<String> arguments) {
+  String _createArgumentsLine(List<String> arguments, int timeout) {
+    arguments = _modifySeleniumTimeout(arguments, timeout);
     return arguments.join(' ').concat('\n');
   }
 
   void _reportResult() {
     if (!active) return;
     // _status == '>>> TEST {PASS, FAIL, OK, CRASH, FAIL, TIMEOUT}'
 
     var outcome = _status.split(" ")[2];
     var exitCode = 0;
     if (outcome == "CRASH") exitCode = CRASHING_BROWSER_EXITCODE;
@@ skipping 646 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
   }
 }