From a33994587b5293fb45f69b1e171cf4eec7176371 Mon Sep 17 00:00:00 2001
From: Cosmin Sabou <csabou@mozilla.com>
Date: Wed, 22 Jul 2020 01:58:51 +0300
Subject: [PATCH] Backed out changeset 9c69d81ccdd2 (bug 1653348) for xpcshell
 failures on test_amo_stats_telemetry.js. CLOSED TREE

---
 .../test/xpcshell/test_amo_stats_telemetry.js | 84 -------------------
 .../extensions/test/xpcshell/xpcshell.ini     |  1 -
 2 files changed, 85 deletions(-)
 delete mode 100644 toolkit/mozapps/extensions/test/xpcshell/test_amo_stats_telemetry.js

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_amo_stats_telemetry.js b/toolkit/mozapps/extensions/test/xpcshell/test_amo_stats_telemetry.js
deleted file mode 100644
index 61f735371664..000000000000
--- a/toolkit/mozapps/extensions/test/xpcshell/test_amo_stats_telemetry.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const { TelemetryController } = ChromeUtils.import(
-  "resource://gre/modules/TelemetryController.jsm"
-);
-
-AddonTestUtils.init(this);
-AddonTestUtils.overrideCertDB();
-
-add_task(async function setup() {
-  await TelemetryController.testSetup();
-  await ExtensionTestUtils.startAddonManager();
-});
-
-add_task(async function test_ping_payload_and_environment() {
-  const extensions = [
-    {
-      id: "addons-telemetry@test-extension-1",
-      name: "some extension 1",
-      version: "1.2.3",
-    },
-    {
-      id: "addons-telemetry@test-extension-2",
-      name: "some extension 2",
-      version: "0.1",
-    },
-  ];
-
-  // Install some extensions.
-  const installedExtensions = [];
-  for (const { id, name, version } of extensions) {
-    const extension = ExtensionTestUtils.loadExtension({
-      manifest: {
-        name,
-        version,
-        applications: { gecko: { id } },
-      },
-      useAddonManager: "permanent",
-    });
-    installedExtensions.push(extension);
-
-    await extension.startup();
-  }
-
-  const { payload, environment } = TelemetryController.getCurrentPingData();
-
-  // Important: `payload.info.addons` is being used for AMO usage stats.
-  Assert.ok("addons" in payload.info, "payload.info.addons is defined");
-  Assert.equal(
-    payload.info.addons,
-    extensions
-      .map(({ id, version }) => `${encodeURIComponent(id)}:${version}`)
-      .join(",")
-  );
-  Assert.ok(
-    "XPI" in payload.addonDetails,
-    "payload.addonDetails.XPI is defined"
-  );
-  for (const { id, name } of extensions) {
-    Assert.ok(id in payload.addonDetails.XPI);
-    Assert.equal(payload.addonDetails.XPI[id].name, name);
-  }
-
-  const { addons } = environment;
-  Assert.ok(
-    "activeAddons" in addons,
-    "environment.addons.activeAddons is defined"
-  );
-  Assert.ok("theme" in addons, "environment.addons.theme is defined");
-  for (const { id } of extensions) {
-    Assert.ok(id in environment.addons.activeAddons);
-  }
-
-  for (const extension of installedExtensions) {
-    await extension.unload();
-  }
-});
-
-add_task(async function cleanup() {
-  await TelemetryController.testShutdown();
-});
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
index 44ace41c0502..a77721dd71bc 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -17,7 +17,6 @@ support-files =
 [test_XPIcancel.js]
 [test_addon_manager_telemetry_events.js]
 [test_addonStartup.js]
-[test_amo_stats_telemetry.js]
 [test_bad_json.js]
 [test_badschema.js]
 [test_builtin_location.js]