Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1499363 - Fix userScript test failure on beta due to runWithPrefs not restoring the initial prefs values. r=robwu

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D9107

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Luca Greco 2018-10-18 17:14:24 +00:00
parent c900a958ac
commit 8dd8306889
1 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
toolkit/components/extensions/test/xpcshell/head.js
View File

@ -113,11 +113,18 @@ function cleanupDir(dir) {
});
}
// Run a test with the specified preferences and then clear them
// Run a test with the specified preferences and then restores their initial values
// right after the test function run (whether it passes or fails).
async function runWithPrefs(prefsToSet, testFn) {
try {
for (let [pref, value] of prefsToSet) {
const setPrefs = (prefs) => {
for (let [pref, value] of prefs) {
if (value === undefined) {
// Clear any pref that didn't have a user value.
info(`Clearing pref "${pref}"`);
Services.prefs.clearUserPref(pref);
continue;
}
info(`Setting pref "${pref}": ${value}`);
switch (typeof(value)) {
case "boolean":
@ -133,12 +140,39 @@ async function runWithPrefs(prefsToSet, testFn) {
throw new Error("runWithPrefs doesn't support this pref type yet");
}
}
};
const getPrefs = (prefs) => {
return prefs.map(([pref, value]) => {
info(`Getting initial pref value for "${pref}"`);
if (!Services.prefs.prefHasUserValue(pref)) {
// Check if the pref doesn't have a user value.
return [pref, undefined];
}
switch (typeof value) {
case "boolean":
return [pref, Services.prefs.getBoolPref(pref)];
case "number":
return [pref, Services.prefs.getIntPref(pref)];
case "string":
return [pref, Services.prefs.getStringPref(pref)];
default:
throw new Error("runWithPrefs doesn't support this pref type yet");
}
});
};
let initialPrefsValues = [];
try {
initialPrefsValues = getPrefs(prefsToSet);
setPrefs(prefsToSet);
await testFn();
} finally {
for (let [prefName] of prefsToSet) {
info(`Clearing pref "${prefName}"`);
Services.prefs.clearUserPref(prefName);
}
info("Restoring initial preferences values on exit");
setPrefs(initialPrefsValues);
}
}