Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 1 changesets (bug 1411093) for failing xpcshell in toolkit/components/telemetry/tests/unit/test_TelemetryLog.js r=backout on a CLOSED TREE.

Browse Source 
Backed out changeset 2b8628840dfe (bug 1411093)
This commit is contained in:
Attila Craciun 2017-10-25 12:02:11 +03:00
parent 01ead6c2f2
commit 0e9f5ef014
18 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/telemetry/tests/unit/head.js
View File

@ -342,14 +342,6 @@ if (runningInParent) {
// Turn off Health Ping submission.
Services.prefs.setBoolPref(TelemetryUtils.Preferences.HealthPingEnabled, false);
// Non-unified Telemetry (e.g. Fennec on Android) needs the preference to be set
// in order to enable Telemetry.
if (Services.prefs.getBoolPref(TelemetryUtils.Preferences.Unified, false)) {
Services.prefs.setBoolPref(TelemetryUtils.Preferences.TelemetryEnabled, true);
} else {
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
}
fakePingSendTimer((callback, timeout) => {
Services.tm.dispatchToMainThread(() => callback());
},

1
toolkit/components/telemetry/tests/unit/test_ChildEvents.js
View File

@ -75,6 +75,7 @@ add_task(async function() {
do_get_profile(true);
loadAddonManager(APP_ID, APP_NAME, APP_VERSION, PLATFORM_VERSION);
finishAddonManagerStartup();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
await TelemetryController.testSetup();
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();

1
toolkit/components/telemetry/tests/unit/test_ChildHistograms.js
View File

@ -91,6 +91,7 @@ add_task(async function() {
// Setup.
do_get_profile(true);
loadAddonManager(APP_ID, APP_NAME, APP_VERSION, PLATFORM_VERSION);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
finishAddonManagerStartup();
await TelemetryController.testSetup();
if (runningInParent) {

1
toolkit/components/telemetry/tests/unit/test_ChildScalars.js
View File

@ -140,6 +140,7 @@ add_task(async function() {
// Setup.
do_get_profile(true);
loadAddonManager(APP_ID, APP_NAME, APP_VERSION, PLATFORM_VERSION);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
finishAddonManagerStartup();
await TelemetryController.testSetup();
if (runningInParent) {

1
toolkit/components/telemetry/tests/unit/test_PingAPI.js
View File

@ -68,6 +68,7 @@ add_task(async function test_setup() {
do_get_profile(true);
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
});
add_task(async function test_archivedPings() {

1
toolkit/components/telemetry/tests/unit/test_PingSender.js
View File

@ -40,6 +40,7 @@ add_task(async function setup() {
// Init the profile.
do_get_profile(true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, true);
// Start the ping server and let Telemetry know about it.

2
toolkit/components/telemetry/tests/unit/test_SubsessionChaining.js
View File

@ -90,6 +90,8 @@ add_task(async function test_setup() {
finishAddonManagerStartup();
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Preferences.set(TelemetryUtils.Preferences.OverridePreRelease, true);
});
add_task(async function test_subsessionsChaining() {

1
toolkit/components/telemetry/tests/unit/test_TelemetryCaptureStack.js
View File

@ -183,5 +183,6 @@ add_task({
function run_test() {
do_get_profile(true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
run_next_test();
}

1
toolkit/components/telemetry/tests/unit/test_TelemetryController.js
View File

@ -96,6 +96,7 @@ add_task(async function test_setup() {
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, true);
await new Promise(resolve =>

1
toolkit/components/telemetry/tests/unit/test_TelemetryControllerShutdown.js
View File

@ -30,6 +30,7 @@ add_task(async function test_setup() {
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, true);
});

1
toolkit/components/telemetry/tests/unit/test_TelemetryController_idle.js
View File

@ -19,6 +19,7 @@ add_task(async function test_setup() {
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, true);
// Start the webserver to check if the pending ping correctly arrives.

1
toolkit/components/telemetry/tests/unit/test_TelemetryHealthPing.js
View File

@ -53,6 +53,7 @@ add_task(async function setup() {
do_get_profile(true);
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref("toolkit.telemetry.enabled", true);
Preferences.set(TelemetryUtils.Preferences.HealthPingEnabled, true);
await TelemetryController.testSetup();

1
toolkit/components/telemetry/tests/unit/test_TelemetryLog.js
View File

@ -27,6 +27,7 @@ function check_event(event, id, data) {
add_task(async function() {
do_get_profile();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
await TelemetryController.testSetup();
TelemetryLog.log(TEST_PREFIX + "1", ["val", 123, undefined]);

1
toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js
View File

@ -57,6 +57,7 @@ add_task(async function test_setup() {
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
// Don't bypass the notifications in this test, we'll fake it.
Services.prefs.setBoolPref(TelemetryUtils.Preferences.BypassNotification, false);

1
toolkit/components/telemetry/tests/unit/test_TelemetrySend.js
View File

@ -84,6 +84,7 @@ add_task(async function test_setup() {
do_get_profile(true);
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.HealthPingEnabled, true);
TelemetryStopwatch.setTestModeEnabled(true);
});

1
toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js
View File

@ -148,6 +148,7 @@ add_task(async function test_setup() {
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
Services.prefs.setCharPref(TelemetryUtils.Preferences.Server,
"http://localhost:" + PingServer.port);
});

1
toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
View File

@ -478,6 +478,7 @@ add_task(async function test_setup() {
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
Services.prefs.setBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, true);
// Make it look like we've previously failed to lock a profile a couple times.

2
toolkit/components/telemetry/tests/unit/test_TelemetrySession_activeTicks.js
View File

@ -13,6 +13,8 @@ add_task(async function test_setup() {
finishAddonManagerStartup();
// Make sure we don't generate unexpected pings due to pref changes.
await setEmptyPrefWatchlist();
Services.prefs.setBoolPref(TelemetryUtils.Preferences.OverridePreRelease, true);
});
add_task(async function test_record_activeTicks() {