Bug 1164562 - Intermittent test_TelemetryController.js test timed out. r=dexter
authorThomas Nguyen <tnguyen@mozilla.com>
Wed, 26 Oct 2016 18:33:22 +0800
changeset 346302 8b98dca70dd1d73edca6e2a03323ae3c5ac999cd
parent 346301 7ebe938d53dbd9d010be61530893d3226ed6ba8e
child 346303 a14a46bd1ea229e6bb735c8a59f270c1c0aa748e
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdexter
bugs1164562
milestone52.0a1
Bug 1164562 - Intermittent test_TelemetryController.js test timed out. r=dexter MozReview-Commit-ID: 4KnTmvEyuFG
toolkit/components/telemetry/tests/unit/test_TelemetryController.js
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
@@ -180,16 +180,18 @@ add_task(function* test_disableDataUploa
                "All the pending pings but the deletion ping should have been deleted");
 
   // Enable the ping server again.
   PingServer.start();
   // We set the new server using the pref, otherwise it would get reset with
   // |TelemetryController.testReset|.
   Preferences.set(TelemetryController.Constants.PREF_SERVER, "http://localhost:" + PingServer.port);
 
+  // Stop the sending task and then start it again.
+  yield TelemetrySend.shutdown();
   // Reset the controller to spin the ping sending task.
   yield TelemetryController.testReset();
   ping = yield PingServer.promiseNextPing();
   checkPingFormat(ping, DELETION_PING_TYPE, true, false);
 
   // Wait on ping activity to settle before moving on to the next test. If we were
   // to shut down telemetry, even though the PingServer caught the expected pings,
   // TelemetrySend could still be processing them (clearing pings would happen in