Add periodic browser restart to ContentShellOnAndroid test runtime. Update test status for Content…

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 723 matching lines @@
 
 /**
  * Describes the current state of a browser used for testing.
  */
 class BrowserTestingStatus {
   Browser browser;
   BrowserTest currentTest;
 
   // This is currently not used for anything except for error reporting.
   // Given the usefulness of this in debugging issues this should not be
-  // removed even when we have really stable system.
+  // removed even when we have a really stable system.
   BrowserTest lastTest;
   bool timeout = false;
   Timer nextTestTimeout;
+  Stopwatch timeSinceRestart = new Stopwatch();
 
   BrowserTestingStatus(Browser this.browser);
 }
 
 
 /**
- * Describes a single test to be run int the browser.
+ * Describes a single test to be run in the browser.
  */
 class BrowserTest {
   // TODO(ricow): Add timeout callback instead of the string passing hack.
   Function doneCallback;
   String url;
   int timeout;
   String lastKnownMessage = '';
   Stopwatch stopwatch;
 
   // This might be null
@@ skipping 30 matching lines @@
 
 /**
  * Encapsulates all the functionality for running tests in browsers.
  * The interface is rather simple. After starting, the runner tests
  * are simply added to the queue and a the supplied callbacks are called
  * whenever a test completes.
  */
 class BrowserTestRunner {
   static const int MAX_NEXT_TEST_TIMEOUTS = 10;
   static const Duration NEXT_TEST_TIMEOUT = const Duration(seconds: 60);
+  static const Duration RESTART_BROWSER_INTERVAL = const Duration(seconds: 60);
 
   final Map globalConfiguration;
   final bool checkedMode; // needed for dartium
 
   String localIp;
   String browserName;
   int maxNumBrowsers;
   // Used to send back logs from the browser (start, stop etc)
   Function logger;
   int browserIdCount = 0;
@@ skipping 42 matching lines @@
       testingServer.nextTestCallBack = getNextTest;
       return getBrowsers().then((browsers) {
         var futures = [];
         for (var browser in browsers) {
           var url = testingServer.getDriverUrl(browser.id);
           var future = browser.start(url).then((success) {
             if (success) {
               var status = new BrowserTestingStatus(browser);
               browserStatus[browser.id] = status;
               status.nextTestTimeout = createNextTestTimer(status);
+              status.timeSinceRestart.start();
             }
             return success;
           });
           futures.add(future);
         }
         return Future.wait(futures).then((values) {
           return !values.contains(false);
         });
       });
     });
@@ skipping 164 matching lines @@
     } else {
       browserStatus.remove(id);
       browser = getInstance();
       new_id = "BROWSER$browserIdCount";
       browserIdCount++;
     }
     browser.id = new_id;
     var status = new BrowserTestingStatus(browser);
     browserStatus[new_id] = status;
     status.nextTestTimeout = createNextTestTimer(status);
+    status.timeSinceRestart.start();
     browser.start(testingServer.getDriverUrl(new_id)).then((success) {
       // We may have started terminating in the mean time.
       if (underTermination) {
         if (status.nextTestTimeout != null) {
           status.nextTestTimeout.cancel();
           status.nextTestTimeout = null;
         }
         browser.close().then((success) {
          // We should never hit this, print it out.
           if (!success) {
@@ skipping 15 matching lines @@
     if (status == null) return null;
     if (status.nextTestTimeout != null) {
       status.nextTestTimeout.cancel();
       status.nextTestTimeout = null;
     }
     if (testQueue.isEmpty) return null;
 
     // 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;
+      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();
     if (status.currentTest == null) {
       status.currentTest = test;
       status.currentTest.lastKnownMessage = '';
     } else {
       // TODO(ricow): Handle this better.
       print("Browser requested next test before reporting previous result");
       print("This happened for browser $browserId");
       print("Old test was: ${status.currentTest.url}");
       print("The test before that was: ${status.lastTest.url}");
@@ skipping 461 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;
   }
 }