commit 06467b96cdedd70af1f741d72a45a051b14288ac Author: Gavin Sharp gavin@gavinsharp.com Date: Wed Jan 8 15:58:47 2014 -0500

Bug 995041 - Properly disable the problematic portions of browser_aboutHome.js. a=test-only --- browser/base/content/test/Makefile.in | 5 ++--- browser/base/content/test/browser_aboutHome.js | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index d41a36f..104ad59 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -67,13 +67,14 @@ MOCHITEST_BROWSER_FILES = \ browser_keywordSearch_postData.js \ POSTSearchEngine.xml \ print_postdata.sjs \ + browser_aboutHome.js \ browser_alltabslistener.js \ browser_bug304198.js \ title_test.svg \ browser_bug329212.js \ browser_bug356571.js \ browser_bug380960.js \ - browser_bug386835.js \ + browser_bug386835.js \ browser_bug405137.js \ browser_bug406216.js \ browser_bug409481.js \ @@ -360,12 +361,10 @@ MOCHITEST_BROWSER_FILES += \ endif

# browser_aboutHealthReport.js disabled for frequent failures on Linux (bug 924307) -# browser_aboutHome.js disabled for frequent failures on Linux (bug 945667) # browser_CTP_context_menu.js fails intermittently on Linux (bug 909342) ifndef MOZ_WIDGET_GTK MOCHITEST_BROWSER_FILES += \ browser_aboutHealthReport.js \ - browser_aboutHome.js \ browser_CTP_context_menu.js \ $(NULL) endif diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js index a890d5f..3edbc56 100644 --- a/browser/base/content/test/browser_aboutHome.js +++ b/browser/base/content/test/browser_aboutHome.js @@ -88,11 +88,19 @@ let gTests = [ } },

+// Disabled on Linux for intermittent issues with FHR, see Bug 945667. +// Disabled always due to bug 992485 { desc: "Check that performing a search fires a search event and records to " + "Firefox Health Report.", setup: function () { }, run: function () { + // Skip this test always for now since it loads google.com and that causes bug 992485 + return; + + // Skip this test on Linux. + if (navigator.platform.indexOf("Linux") == 0) { return; } + try { let cm = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager); cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");