Bug 1148763 - Don't initialise Telemetry twice in browser_bug557956.js. r=gfritzsche, a=test-only
authorAlessio Placitelli <alessio.placitelli@gmail.com>
Wed, 01 Apr 2015 05:09:00 -0400
changeset 265365 d25866a2235f4016451e35a1837141ca229e3bc9
parent 265364 9ededdba9f926dd220e6a629789c696021a76660
child 265366 e7bb84d2392185eab733dbb0333a81f0910375d5
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche, test-only
bugs1148763, 557956
milestone39.0a2
Bug 1148763 - Don't initialise Telemetry twice in browser_bug557956.js. r=gfritzsche, a=test-only
toolkit/mozapps/extensions/test/browser/browser_bug557956.js
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
@@ -194,17 +194,17 @@ function check_telemetry({disabled, meta
 }
 
 add_test(function test_setup() {
   let oldCanRecord = Services.telemetry.canRecordExtended;
   Services.telemetry.canRecordExtended = true;
   registerCleanupFunction(function () {
     Services.telemetry.canRecordExtended = oldCanRecord;
   });
-  TelemetrySession.setup().then(run_next_test);
+  run_next_test();
 });
 
 // Tests that the right add-ons show up in the mismatch dialog and updates can
 // be installed
 add_test(function basic_mismatch() {
   install_test_addons(function() {
     // These add-ons become disabled
     var disabledAddonIds = [
@@ -512,12 +512,8 @@ add_test(function overrides_retrieved() 
 
             EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
           });
         });
       });
     });
   });
 });
-
-add_test(function test_shutdown() {
-  TelemetrySession.shutdown(false).then(run_next_test);
-});