Bug 986261 - Telemetry experiments unit tests hang when they fail. r=felipe

This commit is contained in:
Georg Fritzsche 2014-03-27 14:55:36 +01:00
parent efd347c7a3
commit b2f34334a1
6 changed files with 5 additions and 29 deletions

View File

@ -63,6 +63,7 @@ add_task(function* test_setup() {
gReporter = yield getReporter("json_payload_simple");
yield gReporter.collectMeasurements();
let payload = yield gReporter.getJSONPayload(true);
do_register_cleanup(() => gReporter._shutdown());
patchPolicy(gPolicy, {
updatechannel: () => "nightly",
@ -131,8 +132,3 @@ add_task(function* test_startStop() {
Assert.equal(maybeStop, true, "Experiment should have been stopped.");
Assert.equal(experiment.enabled, false, "Experiment should be disabled.");
});
add_task(function* shutdown() {
yield gReporter._shutdown();
yield removeCacheFile();
});

View File

@ -75,6 +75,7 @@ add_task(function* test_setup() {
gReporter = yield getReporter("json_payload_simple");
yield gReporter.collectMeasurements();
let payload = yield gReporter.getJSONPayload(true);
do_register_cleanup(() => gReporter._shutdown());
gPolicy = new Experiments.Policy();
patchPolicy(gPolicy, {
@ -1278,9 +1279,3 @@ add_task(function* test_unexpectedUninstall() {
yield experiments.uninit();
yield removeCacheFile();
});
add_task(function* shutdown() {
yield gReporter._shutdown();
yield removeCacheFile();
});

View File

@ -76,6 +76,7 @@ add_task(function* test_setup() {
gReporter = yield getReporter("json_payload_simple");
yield gReporter.collectMeasurements();
let payload = yield gReporter.getJSONPayload(true);
do_register_cleanup(() => gReporter._shutdown());
gPolicy = new Experiments.Policy();
patchPolicy(gPolicy, {
@ -264,8 +265,3 @@ add_task(function* test_cache() {
yield experiments.uninit();
yield removeCacheFile();
});
add_task(function* shutdown() {
yield gReporter._shutdown();
yield removeCacheFile();
});

View File

@ -61,6 +61,7 @@ add_task(function* test_setup() {
gReporter = yield getReporter("json_payload_simple");
yield gReporter.collectMeasurements();
let payload = yield gReporter.getJSONPayload(true);
do_register_cleanup(() => gReporter._shutdown());
patchPolicy(gPolicy, {
updatechannel: () => "nightly",
@ -314,8 +315,3 @@ add_task(function* test_times() {
}
}
});
add_task(function* shutdown() {
yield gReporter._shutdown();
yield removeCacheFile();
});

View File

@ -77,6 +77,3 @@ add_task(function* test_fetchInvalid() {
yield ex.uninit();
});
add_task(function* shutdown() {
yield removeCacheFile();
});

View File

@ -114,6 +114,7 @@ add_task(function* test_setup() {
gReporter = yield getReporter("json_payload_simple");
yield gReporter.collectMeasurements();
let payload = yield gReporter.getJSONPayload(true);
do_register_cleanup(() => gReporter._shutdown());
gPolicy = new Experiments.Policy();
let dummyTimer = { cancel: () => {}, clear: () => {} };
@ -353,8 +354,3 @@ add_task(function* test_telemetryBasics() {
yield experiments.uninit();
yield removeCacheFile();
});
add_task(function* shutdown() {
yield gReporter._shutdown();
yield removeCacheFile();
});