Bug 658916 - TEST-UNEXPECTED-FAIL | test_0182_rmrfdirFileInUse_xp_win_complete.js | test failed (with xpcshell return code: 0), see following log:TEST-UNEXPECTED-FAIL | head.js | exception thrown from do_timeout callback. r=mossop

toolkit/mozapps/update/test/unit/head_update.js.in

@@ -486,10 +486,27 @@ function waitForHelperFinished() {
     do_timeout(TEST_HELPER_TIMEOUT, waitForHelperFinished);
     return;
   }
-  output.remove(false);
-  let input = getApplyDirFile("a/b/input", true);
-  if (input.exists()) {
-    input.remove(false);
+  // Give the lock file process time to unlock the file before deleting the
+  // input and output files.
+  do_timeout(TEST_HELPER_TIMEOUT, waitForHelperFinishFileUnlock);
+}
+
+function waitForHelperFinishFileUnlock() {
+  try {
+    let output = getApplyDirFile("a/b/output", true);
+    if (output.exists()) {
+      output.remove(false);
+    }
+    let input = getApplyDirFile("a/b/input", true);
+    if (input.exists()) {
+      input.remove(false);
+    }
+  }
+  catch (e) {
+    // Give the lock file process time to unlock the file before deleting the
+    // input and output files.
+    do_timeout(TEST_HELPER_TIMEOUT, waitForHelperFinishFileUnlock);
+    return;
   }
   do_timeout(TEST_HELPER_TIMEOUT, checkUpdate);
 }