Bug 1373453 Part 2 Convert extensions in telemetry unit tests to webextensions r=Dexter
authorAndrew Swan <aswan@mozilla.com>
Thu, 15 Jun 2017 15:06:16 -0700
changeset 364618 26d62a1ac0e3a33ebbf9b052d40816e1fec72920
parent 364617 91c2ce06c69b1b548762efeca93ea505a5c45d6f
child 364639 d39cd452b52bf82fa4a717172a62d62ab9e5366f
child 364642 07d7d6fd2450c95b0924c723c70d5e285fc2d318
push id32049
push usercbook@mozilla.com
push dateMon, 19 Jun 2017 11:36:23 +0000
treeherdermozilla-central@26d62a1ac0e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersDexter
bugs1373453
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1373453 Part 2 Convert extensions in telemetry unit tests to webextensions r=Dexter We will no longer load non-webextensions from user profiles starting in 57, so with this patch this test works much more like how browsers in the field will run. Note that we will still use legacy extensions for things like system addons, those remain part of this test. MozReview-Commit-ID: CEOdRbrWphi
toolkit/components/telemetry/tests/addons/extension-2/install.rdf
toolkit/components/telemetry/tests/addons/extension/install.rdf
toolkit/components/telemetry/tests/addons/long-fields/install.rdf
toolkit/components/telemetry/tests/addons/long-fields/manifest.json
toolkit/components/telemetry/tests/addons/restartless/install.rdf
toolkit/components/telemetry/tests/addons/restartless/manifest.json
toolkit/components/telemetry/tests/addons/signed-webext/.web-extension-id
toolkit/components/telemetry/tests/addons/signed-webext/META-INF/manifest.mf
toolkit/components/telemetry/tests/addons/signed-webext/META-INF/mozilla.rsa
toolkit/components/telemetry/tests/addons/signed-webext/META-INF/mozilla.sf
toolkit/components/telemetry/tests/addons/signed-webext/manifest.json
toolkit/components/telemetry/tests/addons/signed/META-INF/manifest.mf
toolkit/components/telemetry/tests/addons/signed/META-INF/mozilla.rsa
toolkit/components/telemetry/tests/addons/signed/META-INF/mozilla.sf
toolkit/components/telemetry/tests/addons/signed/install.rdf
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
toolkit/components/telemetry/tests/unit/xpcshell.ini
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/extension-2/install.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>telemetry-ext-2@tests.mozilla.org</em:id>
-    <em:version>2</em:version>
-    <em:type>2</em:type>
-
-    <!-- Front End MetaData -->
-    <em:name>Telemetry test extension 2</em:name>
-    <em:description>Yet another extension that extends twice.</em:description>
-
-  </Description>
-</RDF>
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/extension/install.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>telemetry-ext-1@tests.mozilla.org</em:id>
-    <em:version>1</em:version>
-    <em:type>2</em:type>
-
-    <!-- Front End MetaData -->
-    <em:name>Telemetry test extension</em:name>
-    <em:description>Yet another extension that extends.</em:description>
-
-  </Description>
-</RDF>
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/long-fields/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>tel-longfields-xpi@tests.mozilla.org</em:id>
-    <em:version>This is a really long addon version, that will get limited to 100 characters. We're much longer, we're at about 116.</em:version>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>0</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <!-- Front End MetaData -->
-    <em:name>This is a really long addon name, that will get limited to 100 characters. We're much longer, we're at about 219. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nullam sodales. Yeah, Latin placeholder.</em:name>
-    <em:description>This is a really long addon description, that will get limited to 100 characters. We're much longer, we're at about 200. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nullam sodales.</em:description>
-    <em:bootstrap>true</em:bootstrap>
-
-  </Description>
-</RDF>
new file mode 100644
--- /dev/null
+++ b/toolkit/components/telemetry/tests/addons/long-fields/manifest.json
@@ -0,0 +1,12 @@
+{
+  "manifest_version": 2,
+  "name": "This is a really long addon name, that will get limited to 100 characters. We're much longer, we're at about 219. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nullam sodales. Yeah, Latin placeholder.",
+  "description": "This is a really long addon description, that will get limited to 100 characters. We're much longer, we're at about 200. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nullam sodales.",
+  "version": "1.0",
+
+  "applications": {
+    "gecko": {
+      "id": "tel-longfields-webext@tests.mozilla.org"
+    }
+  }
+}
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/restartless/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>tel-restartless-xpi@tests.mozilla.org</em:id>
-    <em:version>1.0</em:version>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>0</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <!-- Front End MetaData -->
-    <em:name>XPI Telemetry Restartless Test</em:name>
-    <em:description>A restartless addon which gets enabled without a reboot.</em:description>
-    <em:bootstrap>true</em:bootstrap>
-
-  </Description>
-</RDF>
new file mode 100644
--- /dev/null
+++ b/toolkit/components/telemetry/tests/addons/restartless/manifest.json
@@ -0,0 +1,12 @@
+{
+  "manifest_version": 2,
+  "name": "XPI Telemetry Restartless Test",
+  "description": "A restartless addon which gets enabled without a reboot.",
+  "version": "1.0",
+
+  "applications": {
+    "gecko": {
+      "id": "tel-restartless-webext@tests.mozilla.org"
+    }
+  }
+}
new file mode 100644
--- /dev/null
+++ b/toolkit/components/telemetry/tests/addons/signed-webext/.web-extension-id
@@ -0,0 +1,3 @@
+# This file was created by https://github.com/mozilla/web-ext
+# Your auto-generated extension ID for addons.mozilla.org is:
+tel-signed-webext@tests.mozilla.org
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/toolkit/components/telemetry/tests/addons/signed-webext/META-INF/manifest.mf
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+
+Name: manifest.json
+Digest-Algorithms: MD5 SHA1
+MD5-Digest: vh0VF5quc9YIhMhIsZgKcg==
+SHA1-Digest: DNXAbrHJ4ncET5W+qtJl4+45D6s=
+
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b202c515a86839e664f72cb2bdbeed45abb4a053
GIT binary patch
literal 4193
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
AX#fBK
new file mode 100644
--- /dev/null
+++ b/toolkit/components/telemetry/tests/addons/signed-webext/META-INF/mozilla.sf
@@ -0,0 +1,4 @@
+Signature-Version: 1.0
+MD5-Digest-Manifest: tbeA48G5pe86kvUbd4rsXA==
+SHA1-Digest-Manifest: jyvWt2v9XUnYHrvrlSi4BdyZV/0=
+
new file mode 100644
--- /dev/null
+++ b/toolkit/components/telemetry/tests/addons/signed-webext/manifest.json
@@ -0,0 +1,12 @@
+{
+  "manifest_version": 2,
+  "name": "XPI Telemetry Signed Test",
+  "description": "A signed webextension",
+  "version": "1.0",
+
+  "applications": {
+    "gecko": {
+      "id": "tel-signed-webext@tests.mozilla.org"
+    }
+  }
+}
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/signed/META-INF/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-
-Name: install.rdf
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: YEilRfaecTg2bMNPoYqexQ==
-SHA1-Digest: GEnQKM8Coyw83phx/z1oNh327+0=
-
deleted file mode 100644
index 8e5a92650e80e75cc7c603c0375763eebfcf3b9e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/signed/META-INF/mozilla.sf
+++ /dev/null
@@ -1,4 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: Ko2bKTrwTXCdstWHWqCR4w==
-SHA1-Digest-Manifest: k6+jfNGFxXtDd1cSX0ZoIyQ1cww=
-
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/addons/signed/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>tel-signed-xpi@tests.mozilla.org</em:id>
-    <em:version>1.0</em:version>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>0</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <!-- Front End MetaData -->
-    <em:name>XPI Telemetry Signed Test</em:name>
-    <em:description>A signed addon which gets enabled without a reboot.</em:description>
-    <em:bootstrap>true</em:bootstrap>
-
-  </Description>
-</RDF>
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@@ -978,17 +978,17 @@ add_task(async function test_prefDefault
   // We're not watching, but this function does the setup we need.
   TelemetryEnvironment.testWatchPreferences(PREFS_TO_WATCH);
 
   Assert.strictEqual(TelemetryEnvironment.currentEnvironment.settings.userPrefs[PREF_TEST], expectedValue);
 });
 
 add_task(async function test_addonsWatch_InterestingChange() {
   const ADDON_INSTALL_URL = gDataRoot + "restartless.xpi";
-  const ADDON_ID = "tel-restartless-xpi@tests.mozilla.org";
+  const ADDON_ID = "tel-restartless-webext@tests.mozilla.org";
   // We only expect a single notification for each install, uninstall, enable, disable.
   const EXPECTED_NOTIFICATIONS = 4;
 
   let receivedNotifications = 0;
 
   let registerCheckpointPromise = (aExpected) => {
     return new Promise(resolve => TelemetryEnvironment.registerChangeListener(
       "testWatchAddons_Changes" + aExpected, (reason, data) => {
@@ -1013,20 +1013,22 @@ add_task(async function test_addonsWatch
   checkpointPromise = registerCheckpointPromise(2);
   let addon = await AddonManagerTesting.getAddonById(ADDON_ID);
   addon.userDisabled = true;
   await checkpointPromise;
   assertCheckpoint(2);
   Assert.ok(!(ADDON_ID in TelemetryEnvironment.currentEnvironment.addons.activeAddons));
 
   checkpointPromise = registerCheckpointPromise(3);
+  let startupPromise = AddonTestUtils.promiseWebExtensionStartup(ADDON_ID);
   addon.userDisabled = false;
   await checkpointPromise;
   assertCheckpoint(3);
   Assert.ok(ADDON_ID in TelemetryEnvironment.currentEnvironment.addons.activeAddons);
+  await startupPromise;
 
   checkpointPromise = registerCheckpointPromise(4);
   await AddonManagerTesting.uninstallAddonByID(ADDON_ID);
   await checkpointPromise;
   assertCheckpoint(4);
   Assert.ok(!(ADDON_ID in TelemetryEnvironment.currentEnvironment.addons.activeAddons));
 
   Assert.equal(receivedNotifications, EXPECTED_NOTIFICATIONS,
@@ -1114,35 +1116,35 @@ add_task(async function test_addonsWatch
               TelemetryEnvironment.currentEnvironment.addons.activeAddons),
             "Dictionaries should not appear in active addons.");
 
   TelemetryEnvironment.unregisterChangeListener("testNotInteresting");
 });
 
 add_task(async function test_addonsAndPlugins() {
   const ADDON_INSTALL_URL = gDataRoot + "restartless.xpi";
-  const ADDON_ID = "tel-restartless-xpi@tests.mozilla.org";
+  const ADDON_ID = "tel-restartless-webext@tests.mozilla.org";
   const ADDON_INSTALL_DATE = truncateToDays(Date.now());
   const EXPECTED_ADDON_DATA = {
     blocklisted: false,
     description: "A restartless addon which gets enabled without a reboot.",
     name: "XPI Telemetry Restartless Test",
     userDisabled: false,
     appDisabled: false,
     version: "1.0",
     scope: 1,
     type: "extension",
     foreignInstall: false,
     hasBinaryComponents: false,
     installDay: ADDON_INSTALL_DATE,
     updateDay: ADDON_INSTALL_DATE,
     signedState: mozinfo.addon_signing ? AddonManager.SIGNEDSTATE_PRIVILEGED : AddonManager.SIGNEDSTATE_NOT_REQUIRED,
     isSystem: false,
-    isWebExtension: false,
-    multiprocessCompatible: false,
+    isWebExtension: true,
+    multiprocessCompatible: true,
   };
   const SYSTEM_ADDON_ID = "tel-system-xpi@tests.mozilla.org";
   const EXPECTED_SYSTEM_ADDON_DATA = {
     blocklisted: false,
     description: "A system addon which is shipped with Firefox.",
     name: "XPI Telemetry System Add-on Test",
     userDisabled: false,
     appDisabled: false,
@@ -1267,22 +1269,24 @@ add_task(async function test_addonsAndPl
 
   Assert.equal(data.addons.persona, PERSONA_ID, "The correct Persona Id must be reported.");
 
   // Uninstall the addon.
   await AddonManagerTesting.uninstallAddonByID(ADDON_ID);
 });
 
 add_task(async function test_signedAddon() {
-  const ADDON_INSTALL_URL = gDataRoot + "signed.xpi";
-  const ADDON_ID = "tel-signed-xpi@tests.mozilla.org";
+  AddonTestUtils.useRealCertChecks = true;
+
+  const ADDON_INSTALL_URL = gDataRoot + "signed-webext.xpi";
+  const ADDON_ID = "tel-signed-webext@tests.mozilla.org";
   const ADDON_INSTALL_DATE = truncateToDays(Date.now());
   const EXPECTED_ADDON_DATA = {
     blocklisted: false,
-    description: "A signed addon which gets enabled without a reboot.",
+    description: "A signed webextension",
     name: "XPI Telemetry Signed Test",
     userDisabled: false,
     appDisabled: false,
     version: "1.0",
     scope: 1,
     type: "extension",
     foreignInstall: false,
     hasBinaryComponents: false,
@@ -1305,21 +1309,23 @@ add_task(async function test_signedAddon
   checkEnvironmentData(data);
 
   // Check addon data.
   Assert.ok(ADDON_ID in data.addons.activeAddons, "Add-on should be in the environment.");
   let targetAddon = data.addons.activeAddons[ADDON_ID];
   for (let f in EXPECTED_ADDON_DATA) {
     Assert.equal(targetAddon[f], EXPECTED_ADDON_DATA[f], f + " must have the correct value.");
   }
+
+  AddonTestUtils.useRealCertChecks = false;
 });
 
 add_task(async function test_addonsFieldsLimit() {
   const ADDON_INSTALL_URL = gDataRoot + "long-fields.xpi";
-  const ADDON_ID = "tel-longfields-xpi@tests.mozilla.org";
+  const ADDON_ID = "tel-longfields-webext@tests.mozilla.org";
 
   // Install the addon and wait for the TelemetryEnvironment to pick it up.
   let deferred = PromiseUtils.defer();
   TelemetryEnvironment.registerChangeListener("test_longFieldsAddon", deferred.resolve);
   await AddonManagerTesting.installXPIFromURL(ADDON_INSTALL_URL);
   await deferred.promise;
   TelemetryEnvironment.unregisterChangeListener("test_longFieldsAddon");
 
@@ -1346,17 +1352,17 @@ add_task(async function test_collectionW
     id: "telemetry-test2.example.com@services.mozilla.org",
     name: "telemetry broken addon",
     origin: "https://telemetry-test2.example.com",
     version: 1, // This is intentionally not a string.
     signedState: AddonManager.SIGNEDSTATE_SIGNED,
   };
 
   const ADDON_INSTALL_URL = gDataRoot + "restartless.xpi";
-  const ADDON_ID = "tel-restartless-xpi@tests.mozilla.org";
+  const ADDON_ID = "tel-restartless-webext@tests.mozilla.org";
   const ADDON_INSTALL_DATE = truncateToDays(Date.now());
   const EXPECTED_ADDON_DATA = {
     blocklisted: false,
     description: "A restartless addon which gets enabled without a reboot.",
     name: "XPI Telemetry Restartless Test",
     userDisabled: false,
     appDisabled: false,
     version: "1.0",
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -3,32 +3,28 @@ head = head.js
 firefox-appdir = browser
 # The *.xpi files are only needed for test_TelemetryEnvironment.js, but
 # xpcshell fails to install tests if we move them under the test entry.
 support-files =
   ../search/chrome.manifest
   ../search/searchTest.jar
   dictionary.xpi
   experiment.xpi
-  extension.xpi
-  extension-2.xpi
   engine.xml
   system.xpi
   restartless.xpi
   theme.xpi
   testUnicodePDB32.dll
   testNoPDB32.dll
   testUnicodePDB64.dll
   testNoPDB64.dll
   !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 generated-files =
   dictionary.xpi
   experiment.xpi
-  extension.xpi
-  extension-2.xpi
   system.xpi
   restartless.xpi
   theme.xpi
 
 [test_MigratePendingPings.js]
 [test_TelemetryHistograms.js]
 [test_TelemetryStorage.js]
 [test_SubsessionChaining.js]