Do not retry intentionally failing tests on browsers.

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 244 matching lines @@
     return arguments;
   }
 
   int get maxNumRetries => 3;
 }
 
 class BrowserTestCommand extends Command {
   final String browser;
   final String url;
   final Map configuration;
+  final bool retry;
 
   BrowserTestCommand._(String _browser,
                        this.url,
-                       this.configuration)
+                       this.configuration,
+                       this.retry)
       : super._(_browser), browser = _browser;
 
   void _buildHashCode(HashCodeBuilder builder) {
     super._buildHashCode(builder);
     builder.addJson(browser);
     builder.addJson(url);
     builder.add(configuration);
+    builder.add(retry);
   }
 
   bool _equal(BrowserTestCommand other) =>
       super._equal(other) &&
       browser == other.browser &&
       url == other.url &&
-      identical(configuration, other.configuration);
+      identical(configuration, other.configuration) &&
+      retry == other.retry;
 
   String get reproductionCommand {
     var parts = [TestUtils.dartTestExecutable.toString(),
                 'tools/testing/dart/launch_browser.dart',
                 browser,
                 url];
     return parts.map(escapeCommandLineArgument).join(' ');
   }
 }
 
 class BrowserHtmlTestCommand extends BrowserTestCommand {
   List<String> expectedMessages;
   BrowserHtmlTestCommand._(String browser,
                            String url,
                            Map configuration,
-                           this.expectedMessages)
-      : super._(browser, url, configuration);
+                           this.expectedMessages,
+                           bool retry)
+      : super._(browser, url, configuration, retry);
 
   void _buildHashCode(HashCodeBuilder builder) {
     super._buildHashCode(builder);
     builder.addJson(expectedMessages);
   }
 
   bool _equal(BrowserHtmlTestCommand other) =>
       super._equal(other) &&
       identical(expectedMessages, other.expectedMessages);
 }
@@ skipping 249 matching lines @@
                                              List<String> options,
                                              List<String> dartFlags,
                                              Map<String, String> environment) {
     ContentShellCommand command = new ContentShellCommand._(
         executable, htmlFile, options, dartFlags, environment);
     return _getUniqueCommand(command);
   }
 
   BrowserTestCommand getBrowserTestCommand(String browser,
                                            String url,
-                                           Map configuration) {
-    var command = new BrowserTestCommand._(browser, url, configuration);
+                                           Map configuration,
+                                           bool retry) {
+    var command = new BrowserTestCommand._(browser, url, configuration, retry);
     return _getUniqueCommand(command);
   }
 
   BrowserHtmlTestCommand getBrowserHtmlTestCommand(String browser,
                                                String url,
                                                Map configuration,
-                                               List<String> expectedMessages) {
+                                               List<String> expectedMessages,
+                                               bool retry) {
     var command = new BrowserHtmlTestCommand._(
-        browser, url, configuration, expectedMessages);
+        browser, url, configuration, expectedMessages, retry);
     return _getUniqueCommand(command);
   }
 
   CompilationCommand getCompilationCommand(String displayName,
                                            outputFile,
                                            neverSkipCompilation,
                                            List<Uri> bootstrapDependencies,
                                            String executable,
                                            List<String> arguments,
                                            Map<String, String> environment) {
@@ skipping 2019 matching lines @@
 
   Future<CommandOutput> runCommand(node, ProcessCommand command, int timeout) {
     assert(node.dependencies.length == 0);
     return new Future.value(_archive.outputOf(command));
   }
 }
 
 bool shouldRetryCommand(CommandOutput output) {
   var command = output.command;
   // We rerun tests on Safari because 6.2 and 7.1 are flaky. Issue 21434.
-  if (command is BrowserTestCommand && command.browser == 'safari' &&
+  if (command is BrowserTestCommand &&
+      command.retry &&
+      command.browser == 'safari' &&
       output is BrowserControllerTestOutcome &&
       output._rawOutcome != Expectation.PASS) {
-    // TODO(whesse): This retries tests that fail intentionally. Fix this
     return true;
   }
 
   if (!output.successful) {
     List<String> stdout, stderr;
 
     decodeOutput() {
       if (stdout == null && stderr == null) {
         stdout = decodeUtf8(output.stderr).split("\n");
         stderr = decodeUtf8(output.stderr).split("\n");
       }
     }
 
     if (io.Platform.operatingSystem == 'linux') {
       decodeOutput();
       // No matter which command we ran: If we get failures due to the
       // "xvfb-run" issue 7564, try re-running the test.
       bool containsFailureMsg(String line) {
         return line.contains(MESSAGE_CANNOT_OPEN_DISPLAY) ||
                line.contains(MESSAGE_FAILED_TO_RUN_COMMAND);
       }
       if (stdout.any(containsFailureMsg) || stderr.any(containsFailureMsg)) {
         return true;
       }
     }
 
     // We currently rerun dartium tests, see issue 14074.
-    if (command is BrowserTestCommand && command.browser == 'dartium') {
+    if (command is BrowserTestCommand &&
+        command.retry &&
+        command.browser == 'dartium') {
       return true;
     }
   }
   return false;
 }
 
 /*
  * [TestCaseCompleter] will listen for
  * NodeState.Processing -> NodeState.{Successful,Failed} state changes and
  * will complete a TestCase if it is finished.
@@ skipping 281 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }