Speculative fix for webdriver test issues.

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 372 matching lines @@
   String _executable;
   List<String> _batchArguments;
 
   Process _process;
   StringInputStream _stdoutStream;
   StringInputStream _stderrStream;
 
   TestCase _currentTest;
   List<String> _testStdout;
   List<String> _testStderr;
+  bool _stdoutDrained = false;
   bool _stderrDrained = false;
   Date _startTime;
   Timer _timer;
 
   bool _isWebDriver;
 
   BatchRunnerProcess(TestCase testCase) {
     _executable = testCase.commands.last().executable;
     _batchArguments = testCase.batchRunnerArguments;
     _isWebDriver = testCase.configuration['component'] == 'webdriver';
@@ skipping 45 matching lines @@
       } else {
         _process.kill();
       }
     }
   }
 
   void doStartTest(TestCase testCase) {
     _startTime = new Date.now();
     _testStdout = new List<String>();
     _testStderr = new List<String>();
+    _stdoutDrained = false;
     _stderrDrained = false;
     _stdoutStream.onLine = _readStdout(_stdoutStream, _testStdout);
     _stderrStream.onLine = _readStderr(_stderrStream, _testStderr);
     _timer = new Timer(_timeoutHandler, testCase.timeout * 1000);
     var line = _createArgumentsLine(testCase.batchTestArguments);
     _process.stdin.write(line.charCodes());
   }
 
   String _createArgumentsLine(List<String> arguments) {
     return Strings.join(arguments, ' ') + '\n';
   }
 
   void _testCompleted() {
     var test = _currentTest;
     _currentTest = null;
     test.completed();
   }
 
   int _reportResult(String output) {
+    _stdoutDrained = true;
     // output = '>>> TEST {PASS, FAIL, OK, CRASH, FAIL, TIMEOUT}'
     var outcome = output.split(" ")[2];
     var exitCode = 0;
     if (outcome == "CRASH") exitCode = -10;
     if (outcome == "FAIL" || outcome == "TIMEOUT") exitCode = 1;
     new TestOutput(_currentTest, exitCode, outcome == "TIMEOUT", _testStdout,
                    _testStderr, new Date.now().difference(_startTime));
     // Move on when both stdout and stderr has been drained.
     if (_stderrDrained) _testCompleted();
   }
 
   void _stderrDone() {
     _stderrDrained = true;
     // Move on when both stdout and stderr has been drained.
-    if (_currentTest.output != null) _testCompleted();
+    if (_stdoutDrained) _testCompleted();
   }
 
   Function _readStdout(StringInputStream stream, List<String> buffer) {
     return () {
       var status;
       var line = stream.readLine();
       while (line != null) {
         if (line.startsWith('>>> TEST')) {
           status = line;
         } else if (line.startsWith('>>> BATCH START')) {
@@ skipping 46 matching lines @@
     };
     _process.kill();
   }
 
   void _startProcess(then) {
     _process = new Process.start(_executable, _batchArguments);
     _stdoutStream = new StringInputStream(_process.stdout);
     _stderrStream = new StringInputStream(_process.stderr);
     _testStdout = new List<String>();
     _testStderr = new List<String>();
+    _stdoutDrained = false;
     _stderrDrained = false;
     _stdoutStream.onLine = _readStdout(_stdoutStream, _testStdout);
     _stderrStream.onLine = _readStderr(_stderrStream, _testStderr);
     _process.onExit = _exitHandler;
     _process.onStart = then;
   }
 }
 
 /**
  * ProcessQueue is the master control class, responsible for running all
@@ skipping 233 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++;
     }
   }
 }