Revert change 5444

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 168 matching lines @@
 
   String get result();
 
   bool get unexpectedOutput();
 
   bool get hasCrashed();
 
   bool get hasTimedOut();
 
   bool get didFail();
-
+  
   Duration get time();
-
+  
   List<String> get stdout();
 
   List<String> get stderr();
-
+  
   List<String> get diagnostics();
 }
 
 class TestOutputImpl implements TestOutput {
   TestCase testCase;
   int exitCode;
   bool timedOut;
   bool failed = false;
   List<String> stdout;
   List<String> stderr;
@@ skipping 140 matching lines @@
       return _didMultitestFail(errors, staticWarnings);
     }
     return _didStandardTestFail(errors, staticWarnings);
   }
 
   bool _didMultitestFail(List errors, List staticWarnings) {
     Set<String> outcome = testCase.info.multitestOutcome;
     Expect.isNotNull(outcome);
     if (outcome.contains('compile-time error') && errors.length > 0) {
       return true;
-    } else if (outcome.contains('static type warning')
+    } else if (outcome.contains('static type warning') 
         && staticWarnings.length > 0) {
       return true;
     } else if (outcome.isEmpty()
         && (errors.length > 0 || staticWarnings.length > 0)) {
       return true;
     }
     return false;
   }
 
   bool _didStandardTestFail(List errors, List staticWarnings) {
@@ skipping 124 matching lines @@
    */
   void testComplete(int exitCode) {
     new TestOutput.fromCase(testCase, exitCode, timedOut, stdout,
                             stderr, new Date.now().difference(startTime));
     timeoutTimer.cancel();
     if (testCase.output.unexpectedOutput && testCase.configuration['verbose']) {
       print(testCase.displayName);
       for (var line in testCase.output.stderr) print(line);
       for (var line in testCase.output.stdout) print(line);
     }
-    if (allowRetries && testCase.usesWebDriver
+    if (allowRetries && testCase.usesWebDriver 
         && testCase.output.unexpectedOutput && testCase.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.dynamic.numRetries--;
       print("Potential flake. Re-running ${testCase.displayName} " +
           "(${testCase.dynamic.numRetries} attempt(s) remains)");
@@ skipping 321 matching lines @@
   bool _startingServer = false;
 
   /** True if we find that there is already a selenium jar running. */
   bool _seleniumAlreadyRunning = false;
 
   ProcessQueue(int this._maxProcesses,
                String progress,
                Date startTime,
                bool printTiming,
                Function this._enqueueMoreWork,
-               [bool verbose = false,
-                bool listTests = false,
-                bool keepGeneratedTests = false])
-      : _verbose = verbose,
-        _listTests = listTests,
-        _keepGeneratedTests = keepGeneratedTests,
-        _tests = new Queue<TestCase>(),
+               [bool this._verbose = false,
+                bool this._listTests = false,
+                bool this._keepGeneratedTests = false])
+      : _tests = new Queue<TestCase>(),
         _progress = new ProgressIndicator.fromName(progress,
                                                    startTime,
                                                    printTiming),
         _batchProcesses = new Map<String, List<BatchRunnerProcess>>(),
         _testCache = new Map<String, List<TestInformation>>() {
     if (!_enqueueMoreWork(this)) _progress.allDone();
   }
 
   /**
    * Registers a TestSuite so that all of its tests will be run.
@@ skipping 251 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++;
     }
   }
 }