Fix issue that cases the usesWebDriver getter in TestCase to always return false.

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 59 matching lines @@
    * tests have two commands, one to compilate the source and another to execute
    * it. Some isolate tests might even have three, if they require compiling
    * multiple sources that are run in isolation.
    */
   List<Command> commands;
 
   Map configuration;
   String displayName;
   TestOutput output;
   bool isNegative;
-  bool usesWebDriver;
   Set<String> expectedOutcomes;
   TestCaseEvent completedHandler;
   TestInformation info;
 
   TestCase(this.displayName,
            this.commands,
            this.configuration,
            this.completedHandler,
            this.expectedOutcomes,
            {this.isNegative: false,
-            this.info: null,
-            this.usesWebDriver: false}) {
+            this.info: null}) {
     if (!isNegative) {
       this.isNegative = displayName.contains("negative_test");
     }
 
     // Special command handling. If a special command is specified
     // we have to completely rewrite the command that we are using.
     // We generate a new command-line that is the special command where we
     // replace '@' with the original command executable, and generate
     // a command formed like the following
     // Let PREFIX be what is before the @.
@@ skipping 56 matching lines @@
     final runtime = configuration['runtime'];
     final mode = configuration['mode'];
     final arch = configuration['arch'];
     final checked = configuration['checked'] ? '-checked' : '';
     return "$compiler-$runtime$checked ${mode}_$arch";
   }
 
   List<String> get batchRunnerArguments => ['-batch'];
   List<String> get batchTestArguments => commands.last().arguments;
 
+  bool get usesWebDriver => TestUtils.usesWebDriver(configuration['runtime']);
+
   void completed() { completedHandler(this); }
 }
 
 
 /**
  * BrowserTestCase has an extra compilation command that is run in a separate
  * process, before the regular test is run as in the base class [TestCase].
  * If the compilation command fails, then the rest of the test is not run.
  */
 class BrowserTestCase extends TestCase {
@@ skipping 408 matching lines @@
         && (testCase as BrowserTestCase).numRetries > 0) {
       // Selenium tests can be flaky. Try rerunning.
       testCase.output.requestRetry = true;
     }
     if (testCase.output.requestRetry) {
       testCase.output.requestRetry = false;
       this.timedOut = false;
       (testCase as BrowserTestCase).numRetries--;
       print("Potential flake. Re-running ${testCase.displayName} "
           "(${(testCase as BrowserTestCase).numRetries} attempt(s) remains)");
+      // When retrying we need to reset the timeout as well.
+      // Otherwise there will be no timeout handling for the retry.
+      timeoutTimer = null;

[Emily Fortuna, 2012/10/24 17:14:48]

This shouldn't be reached on the bots because the tests are run in batch mode. I
don't see how this change fixes anything?

[Mads Ager (google), 2012/10/24 17:56:03]

This is needed if step1 fails. I believe that only step2 which is running in the
browser is batched. If you make dart2js timeout by making the dart2js.dart main
entry point loop, the test will fail with a timeout. Then it will be retried,
and without this change dart2js will spin in the infinite loop and never be
killed. With this change dart2js compilation will timeout again and the result
of the test will be a timeout as it should be. I tested this change that way
locally before submitting.

       this.start();
     } else {
       testCase.completed();
     }
   }
 
   /**
    * Process exit handler called at the end of every command. It internally
    * treats all but the last command as compilation steps. The last command is
    * the actual test and its output is analyzed in [testComplete].
    */
   void stepExitHandler(int exitCode) {
     process.close();
     process = null;
     int totalSteps = testCase.commands.length;
     String suffix =' (step $currentStep of $totalSteps)';
-    if (timedOut &&
-        !(testCase.usesWebDriver && !testCase.configuration['noBatch'])) {
+    if (timedOut) {
       // Non-webdriver test timed out before it could complete. Webdriver tests
       // run their own timeouts by timing from the launch of the browser (which
       // could be delayed).
       testComplete(0, true);
     } else if (currentStep == totalSteps) {
       // Done with all test commands.
       testComplete(exitCode, false);
     } else if (exitCode != 0) {
       // One of the steps failed.
       stderr.add('test.dart: Compilation failed$suffix, exit code $exitCode\n');
@@ skipping 659 matching lines @@
         // the developer doesn't waste his or her time trying to fix a bunch of
         // tests that appear to be broken but were actually just flakes that
         // didn't get retried because there had already been one failure.
         bool allowRetry = _MAX_FAILED_NO_RETRY > _progress.numFailedTests;
         new RunningProcess(test, allowRetry, this).start();
       }
       _numProcesses++;
     }
   }
 }