Bug 650965 Permaorange, add logging for addons tests r=mbrubeck

This commit is contained in:
Benjamin Stover 2011-04-28 13:47:22 -07:00
Родитель f0c56c0c72
Коммит 169e3209e1
1 изменённых файлов: 11 добавлений и 5 удалений

Просмотреть файл

@ -19,6 +19,8 @@ const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
const PREF_GETADDONS_GETRECOMMENDED = "extensions.getAddons.recommended.url"; const PREF_GETADDONS_GETRECOMMENDED = "extensions.getAddons.recommended.url";
const PREF_GETADDONS_BROWSERECOMMENDED = "extensions.getAddons.recommended.browseURL"; const PREF_GETADDONS_BROWSERECOMMENDED = "extensions.getAddons.recommended.browseURL";
const PREF_GETADDONS_UPDATE = "extensions.update.url"; const PREF_GETADDONS_UPDATE = "extensions.update.url";
const PREF_ADDONS_LOGGING = "extensions.logging.enabled";
const PREF_ADDONS_SECURITY = "extensions.checkUpdateSecurity";
const SEARCH_URL = TESTROOT + "browser_details.xml"; const SEARCH_URL = TESTROOT + "browser_details.xml";
const ADDON_IMG = "chrome://browser/skin/images/alert-addons-30.png"; const ADDON_IMG = "chrome://browser/skin/images/alert-addons-30.png";
@ -76,7 +78,8 @@ function test() {
Services.prefs.setCharPref(PREF_GETADDONS_BROWSESEARCHRESULTS, TESTROOT + "browser_install.xml"); Services.prefs.setCharPref(PREF_GETADDONS_BROWSESEARCHRESULTS, TESTROOT + "browser_install.xml");
Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS, TESTROOT + "browser_install.xml"); Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS, TESTROOT + "browser_install.xml");
Services.prefs.setCharPref(PREF_GETADDONS_UPDATE, TESTROOT + "browser_upgrade.rdf"); Services.prefs.setCharPref(PREF_GETADDONS_UPDATE, TESTROOT + "browser_upgrade.rdf");
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false); Services.prefs.setBoolPref(PREF_ADDONS_SECURITY, false);
Services.prefs.setBoolPref(PREF_ADDONS_LOGGING, true);
run_next_test(); run_next_test();
} }
@ -84,11 +87,15 @@ function end_test() {
close_manager(); close_manager();
Services.prefs.clearUserPref(PREF_GETADDONS_GETRECOMMENDED); Services.prefs.clearUserPref(PREF_GETADDONS_GETRECOMMENDED);
Services.prefs.clearUserPref(PREF_GETADDONS_BROWSERECOMMENDED); Services.prefs.clearUserPref(PREF_GETADDONS_BROWSERECOMMENDED);
Services.prefs.clearUserPref(PREF_GETADDONS_GETSEARCHRESULTS);
Services.prefs.clearUserPref(PREF_GETADDONS_BROWSESEARCHRESULTS); Services.prefs.clearUserPref(PREF_GETADDONS_BROWSESEARCHRESULTS);
finish(); Services.prefs.clearUserPref(PREF_GETADDONS_GETSEARCHRESULTS);
Services.prefs.clearUserPref(PREF_GETADDONS_UPDATE);
Services.prefs.clearUserPref(PREF_ADDONS_SECURITY);
Services.prefs.clearUserPref(PREF_ADDONS_LOGGING);
} }
registerCleanupFunction(end_test);
function add_test(test) { function add_test(test) {
gPendingTests.push(test); gPendingTests.push(test);
} }
@ -98,8 +105,7 @@ function run_next_test() {
info("Test " + gTestsRun + " took " + (Date.now() - gTestStart) + "ms"); info("Test " + gTestsRun + " took " + (Date.now() - gTestStart) + "ms");
if (gPendingTests.length == 0) { if (gPendingTests.length == 0) {
end_test(); finish();
return;
} }
gTestsRun++; gTestsRun++;