Test infrastructure: Avoid restarting browser app on Android twice simultaneously.

tools/testing/dart/browser_controller.dart

 // Copyright (c) 2013, 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.
 library browser;
 
 import "dart:async";
 import "dart:convert" show LineSplitter, UTF8;
 import "dart:core";
 import "dart:io";
 
@@ skipping 980 matching lines @@
       status.currentTest.timeoutTimer =
           createTimeoutTimer(status.currentTest, status);
       status.currentTest.delayUntilTestStarted =
           status.currentTest.stopwatch.elapsed;
     }
   }
 
   void handleTimeout(BrowserTestingStatus status) {
     // We simply kill the browser and starts up a new one!
     // We could be smarter here, but it does not seems like it is worth it.
+    if (status.timeout) {
+      DebugLogger.error(
+          "Got test timeout for an already restarting browser");
+      return;
+    }
     status.timeout = true;
     timedOut.add(status.currentTest.url);
     var id = status.browser.id;
 
     status.currentTest.stopwatch.stop();
     status.browser.close().then((_) {
       var lastKnownMessage =
           'Dom could not be fetched, since the test timed out.';
       if (status.currentTest.lastKnownMessage.length > 0) {
         lastKnownMessage = status.currentTest.lastKnownMessage;
@@ skipping 76 matching lines @@
     // We are currently terminating this browser, don't start a new test.
     if (status.timeout) return null;
 
     // Restart content_shell and dartium on Android if they have been
     // running for longer than RESTART_BROWSER_INTERVAL. The tests have
     // had flaky timeouts, and this may help.
     if ((browserName == 'ContentShellOnAndroid' ||
          browserName == 'DartiumOnAndroid' ) &&
         status.timeSinceRestart.elapsed > RESTART_BROWSER_INTERVAL) {
       var id = status.browser.id;
+      // Reset stopwatch so we don't trigger again before restarting.
+      status.timeout = true;
       status.browser.close().then((_) {
         // We don't want to start a new browser if we are terminating.
         if (underTermination) return;
         restartBrowser(id);
       });
       // Don't send a test to the browser we are restarting.
       return null;
     }
 
     BrowserTest test = testQueue.removeLast();
@@ skipping 29 matching lines @@
   }
 
   Timer createNextTestTimer(BrowserTestingStatus status) {
     return new Timer(BrowserTestRunner.NEXT_TEST_TIMEOUT,
                      () { handleNextTestTimeout(status); });
   }
 
   void handleNextTestTimeout(status) {
     DebugLogger.warning(
         "Browser timed out before getting next test. Restarting");
+    if (status.timeout) return;
     numBrowserGetTestTimeouts++;
     if (numBrowserGetTestTimeouts >= MAX_NEXT_TEST_TIMEOUTS) {
       DebugLogger.error(
           "Too many browser timeouts before getting next test. Terminating");
       terminate().then((_) => exit(1));
     } else {
+      status.timeout = true;
       status.browser.close().then((_) => restartBrowser(status.browser.id));
     }
   }
 
   void queueTest(BrowserTest test) {
     testQueue.add(test);
   }
 
   void printDoubleReportingTests() {
     if (doubleReportingOutputs.length == 0) return;
@@ skipping 415 matching lines @@
     Dart test driver, number of tests: <div id="number"></div><br>
     Currently executing: <div id="currently_executing"></div><br>
     Unhandled error: <div id="unhandled_error"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }