Bug 1456324: Follow-up: Fix assertion in debug builds. r=bustage
authorKris Maglione <maglione.k@gmail.com>
Wed, 25 Apr 2018 13:32:32 -0700
changeset 415671 9b66db25a4e39f94a90c8161187466b61a7a2d03
parent 415670 9a808d4f39dfe8c7abb90ca2905f1e2f329f007e
child 415672 070ece578a860d1b471b21e0208b883fef7f5677
push id33901
push userapavel@mozilla.com
push dateThu, 26 Apr 2018 06:05:37 +0000
treeherdermozilla-central@b62ad926cf2a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1456324
milestone61.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 1456324: Follow-up: Fix assertion in debug builds. r=bustage MozReview-Commit-ID: BUwZBVc87mZ
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
toolkit/mozapps/extensions/test/xpcshell/head_addons.js
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@@ -89,16 +89,17 @@ const pluginHost = Cc["@mozilla.org/plug
  * Used to mock plugin tags in our fake plugin host.
  */
 function PluginTag(aName, aDescription, aVersion, aEnabled) {
   this.pluginTag = pluginHost.createFakePlugin({
     handlerURI: "resource://fake-plugin/${Math.random()}.xhtml",
     mimeEntries: this.mimeTypes.map(type => ({type})),
     name: aName,
     description: aDescription,
+    fileName: `${aName}.so`,
     version: aVersion,
   });
   this.name = aName;
   this.description = aDescription;
   this.version = aVersion;
   this.disabled = !aEnabled;
 }
 
--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -1632,16 +1632,17 @@ async function execSystemAddonTest(setup
 XPCOMUtils.defineLazyServiceGetter(this, "pluginHost",
                                   "@mozilla.org/plugin/host;1", "nsIPluginHost");
 
 class MockPluginTag {
   constructor(opts, enabledState = Ci.nsIPluginTag.STATE_ENABLED) {
     this.pluginTag = pluginHost.createFakePlugin({
       handlerURI: "resource://fake-plugin/${Math.random()}.xhtml",
       mimeEntries: [{type: "application/x-fake-plugin"}],
+      fileName: `${opts.name}.so`,
       ...opts,
     });
     this.pluginTag.enabledState = enabledState;
 
     this.name = opts.name;
     this.version = opts.version;
   }
   async isBlocklisted() {