From f0a4268a5c0e2e86e3824283b93f0a222563b4f6 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Mon, 13 Apr 2009 20:19:03 -0700
Subject: [PATCH] Bug 465490 - Intermittent time out after
 test_0051_general.js: test_0110_general.js hangs randomly.

---
 .../test/unit/data/aus-0110_general-1.xml     |  6 -----
 .../test/unit/data/aus-0110_general-2.xml     |  6 -----
 .../update/test/unit/test_0110_general.js     | 23 +++++++++++--------
 .../update/test/unit/test_0111_general.js     | 23 +++++++++++--------
 4 files changed, 26 insertions(+), 32 deletions(-)
 delete mode 100644 toolkit/mozapps/update/test/unit/data/aus-0110_general-1.xml
 delete mode 100644 toolkit/mozapps/update/test/unit/data/aus-0110_general-2.xml

diff --git a/toolkit/mozapps/update/test/unit/data/aus-0110_general-1.xml b/toolkit/mozapps/update/test/unit/data/aus-0110_general-1.xml
deleted file mode 100644
index 2fecd7e51a9..00000000000
--- a/toolkit/mozapps/update/test/unit/data/aus-0110_general-1.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<updates>
-  <update type="major" version="4.0" extensionVersion="4.0" buildID="20080811053724" licenseURL="http://dummylicense" detailsURL="http://dummydetails/">
-    <patch type="complete" URL="http://localhost:4444/data/aus-0110_general-1.mar" hashFunction="SHA1" hashValue="246522844a98564e831d89b8c9243efca90f687e" size="1444"/>
-  </update>
-</updates>
diff --git a/toolkit/mozapps/update/test/unit/data/aus-0110_general-2.xml b/toolkit/mozapps/update/test/unit/data/aus-0110_general-2.xml
deleted file mode 100644
index ac308d7ffaa..00000000000
--- a/toolkit/mozapps/update/test/unit/data/aus-0110_general-2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<updates>
-  <update type="major" version="4.0" extensionVersion="4.0" buildID="20080811053724" licenseURL="http://dummylicense" detailsURL="http://dummydetails/">
-    <patch type="partial" URL="http://localhost:4444/data/aus-0110_general-2.mar" hashFunction="SHA1" hashValue="62eeb2a3b4d0c46589400dd8e6806f707da05c3e" size="1255"/>
-  </update>
-</updates>
diff --git a/toolkit/mozapps/update/test/unit/test_0110_general.js b/toolkit/mozapps/update/test/unit/test_0110_general.js
index 8a2bd26308a..b25ae1bd643 100644
--- a/toolkit/mozapps/update/test/unit/test_0110_general.js
+++ b/toolkit/mozapps/update/test/unit/test_0110_general.js
@@ -82,14 +82,18 @@ function run_test() {
 
   // Use a directory outside of dist/bin to lessen the garbage in dist/bin
   var updatesSubDir = do_get_cwd();
-  updatesSubDir.append("app_dir");
-  updatesSubDir.append("updates");
-  updatesSubDir.append("0");
+  updatesSubDir.append("0110_complete_mar");
 
-  dump("Testing: cleanup of the updates directory used to test\n");
-  if (updatesSubDir.exists())
-    updatesSubDir.remove(true);
-  do_check_false(updatesSubDir.exists());
+  try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
+    if (updatesSubDir.exists())
+      updatesSubDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + updatesSubDir.path +
+         "\nException: " + e + "\n");
+  }
 
   var mar = do_get_file("data/aus-0110_general-1.mar");
   mar.copyTo(updatesSubDir, "update.mar");
@@ -109,6 +113,8 @@ function run_test() {
   do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
 
   try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
     if (updatesSubDir.exists())
       updatesSubDir.remove(true);
   }
@@ -116,9 +122,6 @@ function run_test() {
     dump("Unable to remove directory\npath: " + updatesSubDir.path +
          "\nException: " + e + "\n");
   }
-  dump("Testing: successful removal of the updates subdirectory where the " +
-       "updater binary was launched\n");
-  do_check_false(updatesSubDir.exists());
 }
 
 // Launches the updater binary to apply a mar file
diff --git a/toolkit/mozapps/update/test/unit/test_0111_general.js b/toolkit/mozapps/update/test/unit/test_0111_general.js
index 8b003f3bf65..825fb2c8594 100644
--- a/toolkit/mozapps/update/test/unit/test_0111_general.js
+++ b/toolkit/mozapps/update/test/unit/test_0111_general.js
@@ -89,14 +89,18 @@ function run_test() {
 
   // Use a directory outside of dist/bin to lessen the garbage in dist/bin
   var updatesSubDir = do_get_cwd();
-  updatesSubDir.append("app_dir");
-  updatesSubDir.append("updates");
-  updatesSubDir.append("0");
+  updatesSubDir.append("0111_partial_mar");
 
-  dump("Testing: cleanup of the updates directory used to test\n");
-  if (updatesSubDir.exists())
-    updatesSubDir.remove(true);
-  do_check_false(updatesSubDir.exists());
+  try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
+    if (updatesSubDir.exists())
+      updatesSubDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + updatesSubDir.path +
+         "\nException: " + e + "\n");
+  }
 
   var mar = do_get_file("data/aus-0110_general-2.mar");
   mar.copyTo(updatesSubDir, "update.mar");
@@ -118,6 +122,8 @@ function run_test() {
   do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
 
   try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
     if (updatesSubDir.exists())
       updatesSubDir.remove(true);
   }
@@ -125,9 +131,6 @@ function run_test() {
     dump("Unable to remove directory\npath: " + updatesSubDir.path +
          "\nException: " + e + "\n");
   }
-  dump("Testing: successful removal of the updates subdirectory where the " +
-       "updater binary was launched\n");
-  do_check_false(updatesSubDir.exists());
 }
 
 // Launches the updater binary to apply a mar file