Move ie11 timeout handling code to BrowserControllerTestOutcome

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 1025 matching lines @@
       Expectation outcome, bool isNegative) {
     if (!isNegative) return outcome;
     if (outcome == Expectation.ignore) return outcome;
     if (outcome.canBeOutcomeOf(Expectation.fail)) {
       return Expectation.pass;
     }
     return Expectation.fail;
   }
 }
 
-class BrowserCommandOutputImpl extends CommandOutputImpl {
+class ContentShellCommandOutputImpl extends CommandOutputImpl {
   // Although tests are reported as passing, content shell sometimes exits with
   // a nonzero exitcode which makes our dartium builders extremely falky.
   // See: http://dartbug.com/15139.
   // TODO(rnystrom): Is this still needed? The underlying bug is closed.
   static int WHITELISTED_CONTENTSHELL_EXITCODE = -1073740022;
   static bool isWindows = io.Platform.operatingSystem == 'windows';
   static bool _failedBecauseOfFlakyInfrastructure(
       Command command, bool timedOut, List<int> stderrBytes) {
     // If the browser test failed, it may have been because content shell
     // and the virtual framebuffer X server didn't hook up, or it crashed with
@@ skipping 10 matching lines @@
       DebugLogger.warning(
           "Warning: Failure because of missing XDisplay. Test ignored");
       return true;
     }
     // TODO(26739): See http://dartbug.com/26739
     if (zygoteCrash.hasMatch(stderr)) {
       DebugLogger.warning("Warning: Failure because of content_shell "
           "zygote crash. Test ignored");
       return true;
     }
-    // TODO(28955): See http://dartbug.com/28955
-    if (timedOut &&
-        command is BrowserTestCommand &&
-        command.browser == Runtime.ie11) {
-      DebugLogger.warning("Timeout of ie11 on test page ${command.url}");
-      return true;
-    }
     return false;
   }
 
   bool _infraFailure;
 
-  BrowserCommandOutputImpl(
+  ContentShellCommandOutputImpl(
       Command command,
       int exitCode,
       bool timedOut,
       List<int> stdout,
       List<int> stderr,
       Duration time,
       bool compilationSkipped)
       : _infraFailure =
             _failedBecauseOfFlakyInfrastructure(command, timedOut, stderr),
         super(command, exitCode, timedOut, stdout, stderr, time,
             compilationSkipped, 0);
 
   Expectation result(TestCase testCase) {
     if (_infraFailure) {
       return Expectation.ignore;
     }
-    // TODO(28955): See http://dartbug.com/28955
-    // The code for this in _failedBecauseOfFlakyInfrastructure doesn't
-    // seem to be working.
-    if (hasTimedOut && testCase.configuration.runtime == Runtime.ie11) {
-      DebugLogger.warning("Timeout of ie11 on test ${testCase.displayName}");
-      return Expectation.ignore;
-    }
+
     // Handle crashes and timeouts first
     if (hasCrashed) return Expectation.crash;
     if (hasTimedOut) return Expectation.timeout;
     if (hasNonUtf8) return Expectation.nonUtf8Error;
 
     var outcome = _getOutcome();
 
     if (testCase.hasRuntimeError) {
       if (!outcome.canBeOutcomeOf(Expectation.runtimeError)) {
         return Expectation.missingRuntimeError;
@@ skipping 75 matching lines @@
       return (!hasCrashed &&
           exitCode != 0 &&
           (!isWindows || exitCode != WHITELISTED_CONTENTSHELL_EXITCODE));
     }
     DebugLogger.warning("Couldn't find 'Content-Type: text/plain' in output. "
         "($command).");
     return true;
   }
 }
 
-class HTMLBrowserCommandOutputImpl extends BrowserCommandOutputImpl {
+// TODO(29869): Remove this class after verifying it isn't used.
+class HTMLBrowserCommandOutputImpl extends ContentShellCommandOutputImpl {
   HTMLBrowserCommandOutputImpl(
       Command command,
       int exitCode,
       bool timedOut,
       List<int> stdout,
       List<int> stderr,
       Duration time,
       bool compilationSkipped)
       : super(command, exitCode, timedOut, stdout, stderr, time,
             compilationSkipped);
@@ skipping 199 matching lines @@
       this._rawOutcome,
       List<int> stdout,
       List<int> stderr)
       : super(command, 0, result.didTimeout, stdout, stderr, result.duration,
             false, 0) {
     _result = result;
   }
 
   Expectation result(TestCase testCase) {
     // Handle timeouts first
-    if (_result.didTimeout) return Expectation.timeout;
+    if (_result.didTimeout) {
+      if (testCase.configuration.runtime == Runtime.ie11) {
+        // TODO(28955): See http://dartbug.com/28955
+        DebugLogger.warning("Timeout of ie11 on test ${testCase.displayName}");
+        return Expectation.ignore;
+      }
+      return Expectation.timeout;
+    }
+
     if (hasNonUtf8) return Expectation.nonUtf8Error;
 
     // Multitests are handled specially
     if (testCase.hasRuntimeError) {
       if (_rawOutcome == Expectation.runtimeError) return Expectation.pass;
       return Expectation.missingRuntimeError;
     }
 
     return _negateOutcomeIfNegativeTest(_rawOutcome, testCase.isNegative);
   }
@@ skipping 307 matching lines @@
 
   bool get canRunDependendCommands => _result == Expectation.pass;
 
   bool get successful => _result == Expectation.pass;
 }
 
 CommandOutput createCommandOutput(Command command, int exitCode, bool timedOut,
     List<int> stdout, List<int> stderr, Duration time, bool compilationSkipped,
     [int pid = 0]) {
   if (command is ContentShellCommand) {
-    return new BrowserCommandOutputImpl(
+    return new ContentShellCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
   } else if (command is BrowserTestCommand) {
     return new HTMLBrowserCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
   } else if (command is AnalysisCommand) {
     return new AnalysisCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
   } else if (command is VmCommand) {
     return new VmCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, pid);
@@ skipping 1468 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }