From 0c01d3febf91818c6f4e441ada7275baeb800144 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 10 Sep 2008 19:17:07 -0700
Subject: [PATCH] Fix intermittent failure of Bug 451085 on Mac OS X. r=me

---
 .../mozapps/update/test/unit/head_update.js   | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/update/test/unit/head_update.js b/toolkit/mozapps/update/test/unit/head_update.js
index 55589a92fb65..d61187c3aebc 100644
--- a/toolkit/mozapps/update/test/unit/head_update.js
+++ b/toolkit/mozapps/update/test/unit/head_update.js
@@ -196,9 +196,46 @@ function remove_dirs_and_files () {
   if (file.exists())
     file.remove(false);
 
+  file = dir.clone();
+  file.append("updates");
+  file.append("last-update.log");
+  try {
+    if (file.exists())
+      file.remove(false);
+  }
+  catch (e) {
+  }
+
+  file = dir.clone();
+  file.append("updates");
+  file.append("0");
+  file.append("update.mar");
+  try {
+    if (file.exists())
+      file.remove(false);
+  }
+  catch (e) {
+  }
+
+  file = dir.clone();
+  file.append("updates");
+  file.append("0");
+  file.append("update.status");
+  try {
+    if (file.exists())
+      file.remove(false);
+  }
+  catch (e) {
+  }
+
+  // This fails sporadically on Mac OS X so wrap it in a try catch
   dir.append("updates");
-  if (dir.exists())
-    dir.remove(true);
+  try {
+    if (dir.exists())
+      dir.remove(true);
+  }
+  catch (e) {
+  }
 }
 
 /**