From 49cb2de1513d7630e2f27e642cfffcbb581cd213 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 13 Jul 2013 11:35:49 +0200
Subject: [PATCH] Bug 890409 - Re-enable browser_aboutHome.js but ignoring
 uncaught exceptions. r=ttaubert

---
 browser/base/content/test/Makefile.in          | 2 +-
 browser/base/content/test/browser_aboutHome.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index cbed37e6921..1dc05eaed6d 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -51,7 +51,6 @@ endif
 # The following tests are disabled because they are unreliable:
 #   browser_bug423833.js is bug 428712
 #   browser_sanitize-download-history.js is bug 432425
-#   browser_aboutHome.js is bug 890409
 #
 # browser_sanitizeDialog_treeView.js is disabled until the tree view is added
 # back to the clear recent history dialog (sanitize.xul), if it ever is (bug
@@ -72,6 +71,7 @@ MOCHITEST_BROWSER_FILES = \
                  blockPluginVulnerableNoUpdate.xml \
                  blockPluginVulnerableUpdatable.xml \
                  browser_aboutHealthReport.js \
+                 browser_aboutHome.js \
                  browser_aboutSyncProgress.js \
                  browser_addKeywordSearch.js \
                  browser_addon_bar_aomlistener.js \
diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js
index 12c3080a6b3..c861fa7dd34 100644
--- a/browser/base/content/test/browser_aboutHome.js
+++ b/browser/base/content/test/browser_aboutHome.js
@@ -263,6 +263,7 @@ function test()
 {
   waitForExplicitFinish();
   requestLongerTimeout(2);
+  ignoreAllUncaughtExceptions();
 
   Task.spawn(function () {
     for (let test of gTests) {