Take out force browser close.

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 444 matching lines @@
 class RunningProcess {
   ProcessQueue processQueue;
   Process process;
   TestCase testCase;
   bool timedOut = false;
   Date startTime;
   Timer timeoutTimer;
   List<String> stdout;
   List<String> stderr;
   List<Function> handlers;
-  bool allowRetries = false;
+  bool allowRetries;
 
   /** Which command of [testCase.commands] is currently being executed. */
   int currentStep;
 
   RunningProcess(TestCase this.testCase,
-      [this.allowRetries, this.processQueue]);
+      [this.allowRetries = false, this.processQueue]);
 
   /**
    * Called when all commands are executed. [exitCode] is 0 if all command
    * succeded, otherwise it will have the exit code of the first failing
    * command.
    */
   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 != null && allowRetries
-        && testCase.usesWebDriver && testCase.output.unexpectedOutput
-        && testCase.numRetries > 0) {
+    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)");
       this.start();
@@ skipping 360 matching lines @@
       throw new Exception(
           'Test suite requires temporary directory. Not supported on Windows.');
     }
     var tempDir = new Directory('');
     tempDir.createTempSync();
     _temporaryDirectory = tempDir.path;
     return _temporaryDirectory;
   }
 
   /**
-   * Sometimes Webdriver doesn't close every browser window when it's done
-   * with a test. At the end of all tests we clear out any neglected processes
-   * that are still running.
-   */
-  void killZombieBrowsers() {
-    String chromeName = 'chrome';
-    if (new Platform().operatingSystem() == 'macos') {
-      chromeName = 'Google\ Chrome';
-    }
-    Map<String, List<String>> processNames = {'ie': ['iexplore'],
-        'safari': ['Safari'], 'ff': ['firefox', 'firefox-bin'],
-        'chrome': ['chromedriver', chromeName]};
-    for (String name in processNames[browserUsed]) {
-      Process process = null;
-      if (new Platform().operatingSystem() == 'windows') {
-        process = new Process.start(
-            'C:\\Windows\\System32\\taskkill.exe', ['/F', '/IM', name + '.exe',
-            '/T']);
-      } else {
-        process = new Process.start('killall', ['-9', name]);
-      }
-
-      if (name == processNames[browserUsed].last()) {
-        process.onExit = (exitCode) {
-          process.close();
-          _progress.allDone();
-        };
-        process.onError = (error) {
-          _progress.allDone();
-        };
-      } else {
-        process.onExit = (exitCode) {
-          process.close();
-        };
-      }
-    }
-  }
-
-  /**
    * Perform any cleanup needed once all tests in a TestSuite have completed
    * and notify our progress indicator that we are done.
    */
   void _cleanupAndMarkDone() {
-    if (browserUsed != '' && _progress is BuildbotProgressIndicator) {
-      killZombieBrowsers();
-      if (_seleniumServer != null) {
+    if (browserUsed != '' && _seleniumServer != null) {
         _seleniumServer.kill();
-      }
     } else {
       _progress.allDone();
     }
   }
 
   void _checkDone() {
     // When there are no more active test listers ask for more work
     // from process queue users.
     if (_activeTestListers == 0 && !_enqueueMoreWork(this)) {
       _progress.allTestsKnown();
@@ skipping 175 matching lines @@
         print(test.displayName + tab + outcomes + tab + test.isNegative +
               tab + Strings.join(test.commands.last().arguments, tab));
         return;
       }
       if (test.usesWebDriver && _needsSelenium && !_isSeleniumAvailable) {
         // The server is not ready to run Selenium tests. Put the test back in
         // the queue.
         _tests.addFirst(test);
         return;
       }
-      if (_verbose) print(test.commands.last().commandLine);
+      if (_verbose) {
+        for (Command command in test.commands) print(command.commandLine);
+      }
       _progress.start(test);
       Function oldCallback = test.completedHandler;
       Function wrapper = (TestCase test_arg) {
         _numProcesses--;
         _progress.done(test_arg);
         _tryRunTest();
         oldCallback(test_arg);
       };
       test.completedHandler = wrapper;
       if (test.configuration['component'] == 'dartc' &&
           test.displayName != 'dartc/junit_tests') {
         _getBatchRunner(test).startTest(test);
       } else {
         // Once we've actually failed a test, technically, we wouldn't need to
         // bother retrying any subsequent tests since the bot is already red.
         // However, we continue to retry tests until we have actually failed
         // four tests (arbitrarily chosen) for more debugable output, so that
         // 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++;
     }
   }
 }