wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1217282 - Add test coverage. r=gfritzsche

Browse Source
This commit is contained in:
Alessio Placitelli 2015-12-15 05:44:00 +01:00
parent dd49917d03
commit 04c7894453
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/experiments/test/xpcshell/head.js
View File

@ -233,3 +233,7 @@ function replaceExperiments(experiment, list) {
}, },
}); });
} }
// Experiments require Telemetry to be enabled, and that's not true for debug
// builds. Let's just enable it here instead of going through each test.
Services.prefs.setBoolPref(PREF_TELEMETRY_ENABLED, true);

21
browser/experiments/test/xpcshell/test_telemetry_disabled.js Normal file
View File

@ -0,0 +1,21 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
Cu.import("resource:///modules/experiments/Experiments.jsm");
add_test(function test_experiments_activation() {
do_get_profile();
loadAddonManager();
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setBoolPref(PREF_TELEMETRY_ENABLED, false);
let experiments = Experiments.instance();
Assert.ok(!experiments.enabled, "Experiments must be disabled if Telemetry is disabled.");
// TODO: Test that Experiments are turned back on when bug 1232648 lands.
run_next_test();
});

1
browser/experiments/test/xpcshell/xpcshell.ini
View File

@ -24,6 +24,7 @@ generated-files =
[test_disableExperiments.js] [test_disableExperiments.js]
[test_fetch.js] [test_fetch.js]
[test_telemetry.js] [test_telemetry.js]
[test_telemetry_disabled.js]
[test_healthreport.js] [test_healthreport.js]
[test_previous_provider.js] [test_previous_provider.js]
[test_upgrade.js] [test_upgrade.js]

4
toolkit/mozapps/extensions/test/browser/browser_experiments.js
View File

@ -98,6 +98,7 @@ add_task(function* initializeState() {
registerCleanupFunction(() => { registerCleanupFunction(() => {
Services.prefs.clearUserPref("experiments.enabled"); Services.prefs.clearUserPref("experiments.enabled");
Services.prefs.clearUserPref("toolkit.telemetry.enabled");
if (gHttpServer) { if (gHttpServer) {
gHttpServer.stop(() => {}); gHttpServer.stop(() => {});
if (gSavedManifestURI !== undefined) { if (gSavedManifestURI !== undefined) {
@ -294,6 +295,7 @@ add_task(function* testActivateExperiment() {
// We need to remove the cache file to help ensure consistent state. // We need to remove the cache file to help ensure consistent state.
yield OS.File.remove(gExperiments._cacheFilePath); yield OS.File.remove(gExperiments._cacheFilePath);
Services.prefs.setBoolPref("toolkit.telemetry.enabled", true);
Services.prefs.setBoolPref("experiments.enabled", true); Services.prefs.setBoolPref("experiments.enabled", true);
info("Initializing experiments service."); info("Initializing experiments service.");
@ -635,6 +637,8 @@ add_task(function* testCleanup() {
yield OS.File.remove(gExperiments._cacheFilePath); yield OS.File.remove(gExperiments._cacheFilePath);
yield gExperiments.uninit(); yield gExperiments.uninit();
yield gExperiments.init(); yield gExperiments.init();
Services.prefs.clearUserPref("toolkit.telemetry.enabled");
} }
// Check post-conditions. // Check post-conditions.