Bug 895873 - Re-enable browser_context_menu_tests.js. Intermittent oranges likely fixed in bug 856264. r=jimm

--HG--
extra : rebase_source : c2e731fd5b061eda420e60cf959c39346df65003
This commit is contained in:
Jonathan Wilde 2013-08-08 12:19:55 -07:00
parent c71dad7f45
commit 59da330935
2 changed files with 13 additions and 10 deletions

View File

@ -10,20 +10,17 @@ 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 \

View File

@ -352,6 +352,9 @@ gTests.push({
}
});
/*
XXX code used to diagnose bug 880739
var observeLogger = {
observe: function (aSubject, aTopic, aData) {
info("observeLogger: " + aTopic);
@ -383,15 +386,18 @@ var observeLogger = {
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");