Backed out changeset e289c0bdae84 (bug 1293318)

toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js

@@ -729,9 +729,10 @@ function checkEnvironmentData(data, isInitial = false, expectBrokenAddons = fals
   checkAddonsSection(data, expectBrokenAddons);
 }
 
-add_task(function* test_setup() {
+function run_test() {
   // Load a custom manifest to provide search engine loading from JAR files.
   do_load_manifest("chrome.manifest");
+  do_test_pending();
   spoofGfxAdapter();
   do_get_profile();
 
@@ -763,6 +764,16 @@ add_task(function* test_setup() {
   // Spoof the the hotfixVersion
   Preferences.set("extensions.hotfix.lastVersion", APP_HOTFIX_VERSION);
 
+  run_next_test();
+}
+
+function isRejected(promise) {
+  return new Promise((resolve, reject) => {
+    promise.then(() => resolve(false), () => resolve(true));
+  });
+}
+
+add_task(function* asyncSetup() {
   yield spoofProfileReset();
   TelemetryEnvironment.delayedInit();
 });
@@ -1410,3 +1421,7 @@ add_task(function* test_environmentShutdown() {
   // Unregister the listener.
   TelemetryEnvironment.unregisterChangeListener("test_environmentShutdownChange");
 });
+
+add_task(function*() {
+  do_test_finished();
+});