Bug 1254958 - browser_mozLoop_telemetry.js fails due to not resetting…

… prefs. r=mancas
mozilla · Mar 9, 2016 · bcca86d · bcca86d
1 parent df564ab
commit bcca86d
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/add-on/chrome/test/mochitest/browser_mozLoop_telemetry.js b/add-on/chrome/test/mochitest/browser_mozLoop_telemetry.js
@@ -11,13 +11,27 @@ var [, gHandlers] = LoopAPI.inspect();
 var gConstants;
 gHandlers.GetAllConstants({}, constants => gConstants = constants);
 
+function resetMauPrefs() {
+  Services.prefs.clearUserPref("loop.mau.openPanel");
+  Services.prefs.clearUserPref("loop.mau.openConversation");
+  Services.prefs.clearUserPref("loop.mau.roomOpen");
+  Services.prefs.clearUserPref("loop.mau.roomShare");
+  Services.prefs.clearUserPref("loop.mau.roomDelete");
+}
+
 /**
  * Enable local telemetry recording for the duration of the tests.
  */
 add_task(function* test_initialize() {
   let oldCanRecord = Services.telemetry.canRecordExtended;
   Services.telemetry.canRecordExtended = true;
+
+  // Ensure prefs are their default values.
+  resetMauPrefs();
+
   registerCleanupFunction(function() {
+    // Clean up the prefs after use to be nice.
+    resetMauPrefs();
     Services.telemetry.canRecordExtended = oldCanRecord;
   });
 });
@@ -179,6 +193,9 @@ add_task(function* test_mozLoop_telemetryAdd_loopMauType_buckets() {
     "LOOP_MAU_TYPE.ROOM_SHARE");
   Assert.strictEqual(snapshot.counts[ACTION_TYPES.ROOM_DELETE], 1,
     "LOOP_MAU_TYPE.ROOM_DELETE");
+
+  // Reset the prefs here, so we don't affect other tests in this file.
+  resetMauPrefs();
 });
 
 /**
@@ -205,7 +222,8 @@ add_task(function* test_mozLoop_telemetryAdd_loopMau_more_than_30_days() {
   Assert.strictEqual(snapshot.counts[ACTION_TYPES.OPEN_PANEL], 2,
     "LOOP_MAU_TYPE.OPEN_PANEL");
 
-  Services.prefs.clearUserPref("loop.mau.openPanel");
+  // Reset the prefs here, so we don't affect other tests in this file.
+  resetMauPrefs();
 });
 
 add_task(function* test_mozLoop_telemetryAdd_loopMau_less_than_30_days() {
@@ -228,5 +246,6 @@ add_task(function* test_mozLoop_telemetryAdd_loopMau_less_than_30_days() {
   Assert.strictEqual(snapshot.counts[ACTION_TYPES.OPEN_PANEL], 1,
     "LOOP_MAU_TYPE.OPEN_PANEL");
 
-  Services.prefs.clearUserPref("loop.mau.openPanel");
+  // Reset the prefs here, so we don't affect other tests in this file.
+  resetMauPrefs();
 });