Add retry to test scripts' attempt to delete temporary Chrome config dirs.

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 UTF8, JSON;
 import "dart:core";
 import "dart:io";
 import "dart:math" show min;
 
 import 'android.dart';
 import 'http_server.dart';
 import 'path.dart';
 import 'utils.dart';
 
-import 'reset_safari.dart' show
-    killAndResetSafari;
+import 'reset_safari.dart' show killAndResetSafari;
 
 class BrowserOutput {
   final StringBuffer stdout = new StringBuffer();
   final StringBuffer stderr = new StringBuffer();
   final StringBuffer eventLog = new StringBuffer();
 }
 
 /** Class describing the interface for communicating with browsers. */
 abstract class Browser {
   BrowserOutput _allBrowserOutput = new BrowserOutput();
@@ skipping 276 matching lines @@
     if (!Browser.resetBrowserConfiguration) return true;
 
     Completer completer = new Completer();
     handleUncaughtError(error, StackTrace stackTrace) {
       if (!completer.isCompleted) {
         completer.completeError(error, stackTrace);
       } else {
         throw new AsyncError(error, stackTrace);
       }
     }
+
     Zone parent = Zone.current;
     ZoneSpecification specification = new ZoneSpecification(
         print: (Zone self, ZoneDelegate delegate, Zone zone, String line) {
-          delegate.run(parent, () {
-            _logEvent(line);
-          });
-        });
+      delegate.run(parent, () {
+        _logEvent(line);
+      });
+    });
     Future zoneWrapper() {
       Uri safariUri = Uri.base.resolve(safariBundleLocation);
       return new Future(() => killAndResetSafari(bundle: safariUri))
           .then(completer.complete);
     }
 
     // We run killAndResetSafari in a Zone as opposed to running an external
     // process. The Zone allows us to collect its output, and protect the rest
     // of the test infrastructure against errors in it.
-    runZoned(
-        zoneWrapper, zoneSpecification: specification,
-        onError: handleUncaughtError);
+    runZoned(zoneWrapper,
+        zoneSpecification: specification, onError: handleUncaughtError);
 
     try {
       await completer.future;
       return true;
     } catch (error, st) {
       _logEvent("Unable to reset Safari: $error$st");
       return false;
     }
   }
 
@@ skipping 62 matching lines @@
     _cleanup = () {
       userDir.deleteSync(recursive: true);
     };
     try {
       await _createLaunchHTML(userDir.path, url);
     } catch (error) {
       _logEvent("Error creating launch HTML: $error");
       return false;
     }
     var args = [
-        "-d", "-i", "-m", "-s", "-u", _binary,
-        "${userDir.path}/launch.html"];
+      "-d",
+      "-i",
+      "-m",
+      "-s",
+      "-u",
+      _binary,
+      "${userDir.path}/launch.html"
+    ];
     try {
       return startBrowserProcess("/usr/bin/caffeinate", args);
     } catch (error) {
       _logEvent("Error starting browser process: $error");
       return false;
     }
   }
 
   Future<Null> onDriverPageRequested() async {
-    await Process.run("/usr/bin/osascript",
-        ['-e', 'tell application "Safari" to activate']);
+    await Process.run(
+        "/usr/bin/osascript", ['-e', 'tell application "Safari" to activate']);
   }
 
   String toString() => "Safari";
 }
 
 class Chrome extends Browser {
   String _version = "Version not found yet";
 
   Map<String, String> _getEnvironment() => null;
 
@@ skipping 353 matching lines @@
         _logEvent("Failed to firefox get version");
         _logEvent("Make sure $_binary is a valid program for running firefox");
         return new Future.value(false);
       }
       version = versionResult.stdout;
       _logEvent("Got version: $version");
 
       return Directory.systemTemp.createTemp().then((userDir) {
         _createPreferenceFile(userDir.path);
         _cleanup = () {
-          userDir.deleteSync(recursive: true);
+          try {
+            userDir.deleteSync(recursive: true);
+          } catch (e) {
+            _logEvent(
+                "Error: failed to delete Chrome user-data-dir ${userDir.path}"
+                ", will try again in 40 seconds: $e");
+            new Timer(new Duration(seconds: 40), () {
+              try {
+                userDir.deleteSync(recursive: true);
+              } catch (e) {
+                _logEvent("Error: failed on second attempt to delete Chrome "
+                    "user-data-dir ${userDir.path}: $e");
+              }
+            });
+          }
         };
         var args = [
           "-profile",
           "${userDir.path}",
           "-no-remote",
           "-new-instance",
           url
         ];
         var environment = new Map<String, String>.from(Platform.environment);
         environment["MOZ_CRASHREPORTER_DISABLE"] = "1";
@@ skipping 151 matching lines @@
   // When no browser is currently starting, _currentStartingBrowserId is null.
   bool get aBrowserIsCurrentlyStarting => _currentStartingBrowserId != null;
   void markCurrentlyStarting(String id) {
     _currentStartingBrowserId = id;
   }
 
   void markNotCurrentlyStarting(String id) {
     if (_currentStartingBrowserId == id) _currentStartingBrowserId = null;
   }
 
-  BrowserTestRunner(
-      Map configuration,
-      String localIp,
-      String browserName,
+  BrowserTestRunner(Map configuration, String localIp, String browserName,
       this.maxNumBrowsers)
       : configuration = configuration,
         localIp = localIp,
         browserName = (browserName == 'ff') ? 'firefox' : browserName,
         checkedMode = configuration['checked'],
         testingServer = new BrowserTestingServer(
-            configuration, localIp,
+            configuration,
+            localIp,
             Browser.requiresIframe(browserName),
             Browser.requiresFocus(browserName)) {
     testingServer.testRunner = this;
   }
 
   Future start() async {
     await testingServer.start();
     testingServer
       ..testDoneCallBack = handleResults
       ..testStatusUpdateCallBack = handleStatusUpdate
@@ skipping 374 matching lines @@
           DebugLogger.error("Error getting error from browser"
               "on uri ${request.uri.path}: $error");
         });
         request.response.close();
         DebugLogger.error("Error from browser on : "
             "${request.uri.path}, data:  $back");
       }, onError: (error) {
         print(error);
       });
     }
+
     void errorHandler(e) {
       if (!underTermination) print("Error occured in httpserver: $e");
     }
+
     errorReportingServer.listen(errorReportingHandler, onError: errorHandler);
   }
 
   void setupDispatchingServer(_) {
     DispatchingServer server = configuration['_servers_'].server;
     void noCache(request) {
       request.response.headers
           .set("Cache-Control", "no-cache, no-store, must-revalidate");
     }
+
     int testId(request) => int.parse(request.uri.queryParameters["id"]);
     String browserId(request, prefix) =>
         request.uri.path.substring(prefix.length + 1);
 
     server.addHandler(reportPath, (HttpRequest request) {
       noCache(request);
       handleReport(request, browserId(request, reportPath), testId(request),
           isStatusUpdate: false);
     });
     server.addHandler(statusUpdatePath, (HttpRequest request) {
@@ skipping 450 matching lines @@
     </div>
     <div id="embedded_iframe_div" class="test box">
       <iframe id="embedded_iframe"></iframe>
     </div>
   </body>
 </html>
 """;
     return driverContent;
   }
 }