Bug 1819657 - Re-try removing minidumps generated during xpcshell tests to...

Bug 1819657 - Re-try removing minidumps generated during xpcshell tests to avoid intermittent failures on Windows r=KrisWright

Differential Revision: https://phabricator.services.mozilla.com/D171367

toolkit/crashreporter/test/unit/head_crashreporter.js

@@ -139,12 +139,21 @@ async function handleMinidump(callback) {
   let memoryfile = minidump.clone();
   memoryfile.leafName = memoryfile.leafName.slice(0, -4) + ".memory.json.gz";
 
-  let cleanup = function() {
-    [minidump, extrafile, memoryfile].forEach(file => {
+  let cleanup = async function() {
+    for (let file of [minidump, extrafile, memoryfile]) {
       if (file.exists()) {
-        file.remove(false);
+        let file_removed = false;
+        while (!file_removed) {
+          try {
+            file.remove(false);
+            file_removed = true;
+          } catch (e) {
+            // On Windows the file may be locked, wait briefly and try again
+            await new Promise(resolve => do_timeout(50, resolve));
+          }
+        }
       }
-    });
+    }
   };
 
   // Just in case, don't let these files linger.
@@ -157,7 +166,7 @@ async function handleMinidump(callback) {
     await callback(minidump, extra, extrafile, memoryfile);
   }
 
-  cleanup();
+  await cleanup();
 }
 
 function spinEventLoop() {