Bug 895873 - Re-enable browser_context_menu_tests.js. Intermittent oranges likely fixed in bug 856264. r=jimm
authorJonathan Wilde <jwilde@jwilde.me>
Thu, 08 Aug 2013 12:19:55 -0700
changeset 141832 a1bbe2f010473ba81990e8eb82c6f0602c2b2b1f
parent 141831 b3c93b2281fcc4ec9dee8d0e453d458b6bc9bebf
child 141833 0f21776e01b99b87877b1c24c30690cbc9b7548b
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjimm
bugs895873, 856264
milestone26.0a1
Bug 895873 - Re-enable browser_context_menu_tests.js. Intermittent oranges likely fixed in bug 856264. r=jimm
browser/metro/base/tests/mochitest/Makefile.in
browser/metro/base/tests/mochitest/browser_context_menu_tests.js
--- a/browser/metro/base/tests/mochitest/Makefile.in
+++ b/browser/metro/base/tests/mochitest/Makefile.in
@@ -5,30 +5,27 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# Disabled for intermittent failures
-# Bug 880739
-#  browser_context_menu_tests.js \
-#  browser_context_menu_tests_01.html \
-#  browser_context_menu_tests_02.html \
-#  browser_context_menu_tests_03.html \
-#  browser_context_menu_tests_04.html \
-
 MOCHITEST_METRO_FILES = \
   head.js \
   browser_urlbar.js \
   browser_bookmarks.js \
   browser_canonizeURL.js \
   browser_circular_progress_indicator.js \
+  browser_context_menu_tests.js \
+  browser_context_menu_tests_01.html \
+  browser_context_menu_tests_02.html \
+  browser_context_menu_tests_03.html \
+  browser_context_menu_tests_04.html \
   browser_context_ui.js \
   browser_downloads.js \
   browser_findbar.js \
   browser_findbar.html \
   browser_history.js \
   browser_onscreen_keyboard.js \
   browser_onscreen_keyboard.html \
   browser_prefs_ui.js \
--- a/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
+++ b/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
@@ -347,16 +347,19 @@ gTests.push({
     promise = waitForEvent(document, "popuphidden");
     ContextMenuUI.hide();
     yield promise;
 
     Browser.closeTab(Browser.selectedTab, { forceClose: true });
   }
 });
 
+/*
+XXX code used to diagnose bug 880739
+
 var observeLogger = {
   observe: function (aSubject, aTopic, aData) {
     info("observeLogger: " + aTopic);
   },
   QueryInterface: function (aIID) {
     if (!aIID.equals(Ci.nsIObserver) &&
         !aIID.equals(Ci.nsISupportsWeakReference) &&
         !aIID.equals(Ci.nsISupports)) {
@@ -378,25 +381,28 @@ var observeLogger = {
     Services.obs.removeObserver(observeLogger, "dl-done");
     Services.obs.removeObserver(observeLogger, "dl-failed");
     Services.obs.removeObserver(observeLogger, "dl-scanning");
     Services.obs.removeObserver(observeLogger, "dl-blocked");
     Services.obs.removeObserver(observeLogger, "dl-dirty");
     Services.obs.removeObserver(observeLogger, "dl-cancel");
   }
 }
+*/
 
 // Image context menu tests
 gTests.push({
   desc: "image context menu",
   setUp: function() {
-    observeLogger.init();
+    // XXX code used to diagnose bug 880739
+    //observeLogger.init();
   },
   tearDown: function() {
-    observeLogger.shutdown();
+    // XXX code used to diagnose bug 880739
+    //observeLogger.shutdown();
   },
   run: function test() {
     info(chromeRoot + "browser_context_menu_tests_01.html");
     yield addTab(chromeRoot + "browser_context_menu_tests_01.html");
 
     let win = Browser.selectedTab.browser.contentWindow;
 
     purgeEventQueue();