Backed out changeset 20bdfda7c573 (bug 1294235) for browser_webext_options.js perma failure CLOSED TREE

toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1/META-INF/manifest.mf

@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-
-Name: install.rdf
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 59ZQahS8eYm678dptqF2fQ==
-SHA1-Digest: fCpbSYnLdjYZpC1t1zwsEztrYA8=
-

toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1/META-INF/mozilla.sf

@@ -1,4 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: Cp9ofwdMdvAralffnWqQww==
-SHA1-Digest-Manifest: TpmukUYFQ+eJgQzFeAUYw+PzUdY=
-

toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2/META-INF/manifest.mf

@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-
-Name: install.rdf
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: 1gYPkSqlgVzw1RWJIVLXrQ==
-SHA1-Digest: 046B+AIjFVBHO7G2BQfj2zoPvRw=
-

toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2/META-INF/mozilla.sf

@@ -1,4 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: whMuT0nKTV49pQyLDTgTfA==
-SHA1-Digest-Manifest: WzDdDwYCt5znpmOn2Sz8eCWWcvA=
-

toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1/META-INF/manifest.mf

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-
-Name: manifest.json
-Digest-Algorithms: MD5 SHA1 SHA256
-MD5-Digest: mCLu38qfGN3trj7qKQQeEA==
-SHA1-Digest: A1BaJErQY6KqnYDijP0lglrehk0=
-SHA256-Digest: p2vjGP7DRqrK81NfT4LqnF7a5p8+lEuout5WLBhk9AA=
-

toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1/META-INF/mozilla.sf

@@ -1,5 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: LrrwWBKNYWeVd205Hq+JwQ==
-SHA1-Digest-Manifest: MeqqQN+uuf0MVesMXxbBtYN+5tU=
-SHA256-Digest-Manifest: iWCxfAJX593Cn4l8R63jaQETO5HX3XOhcnpQ7nMiPlg=
-

toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2/META-INF/manifest.mf

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-
-Name: manifest.json
-Digest-Algorithms: MD5 SHA1 SHA256
-MD5-Digest: 3dL7JFDBPC63pSFI5x+Z7Q==
-SHA1-Digest: l1cKPyWJIYdZyvumH9VfJ6fpqVA=
-SHA256-Digest: QHTjPqTMXxt5tl8zOaAzpQ8FZLqZx8LRF9LmzY+RCDQ=
-

toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2/META-INF/mozilla.sf

@@ -1,5 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: c30hzcI1ISlt46ODjVVJ2w==
-SHA1-Digest-Manifest: 2yMpQHuLM0J61T7vt11NHoYI1tU=
-SHA256-Digest-Manifest: qtsYxiv1zGWBp7JWxLWrIztIdxIt+i3CToReEx5fkyw=
-

toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop_incompat/META-INF/manifest.mf

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-
-Name: manifest.json
-Digest-Algorithms: MD5 SHA1 SHA256
-MD5-Digest: Wzo/k6fhArpFb4UB2hIKlg==
-SHA1-Digest: D/WDy9api0X7OgRM6Gkvfbyzogo=
-SHA256-Digest: IWBdbytHgPLtCMKKhiZ3jenxKmKiRAhh3ce8iP5AVWU=
-

toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop_incompat/META-INF/mozilla.sf

@@ -1,5 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: ovtNeIie34gMM5l18zP2MA==
-SHA1-Digest-Manifest: c5owdrvcOINxKp/HprYkWXXI/js=
-SHA256-Digest-Manifest: uLPmoONlxFYxWeSTOEPJ9hN2yMDDZMJL1PoNIWcqKG4=
-

toolkit/mozapps/extensions/test/browser/addons/browser_installssl/META-INF/manifest.mf

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-
-Name: manifest.json
-Digest-Algorithms: MD5 SHA1 SHA256
-MD5-Digest: b4Q2C4GsIJfRLsXc7T2ldQ==
-SHA1-Digest: UG5rHxpzKmdlGrquXaguiAGDu8E=
-SHA256-Digest: WZrN9SdGBux9t3lV7TVIvyUG/L1px4er2dU3TsBpC4s=
-

toolkit/mozapps/extensions/test/browser/addons/browser_installssl/META-INF/mozilla.sf

@@ -1,5 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: zqRm8+jxS0iRUGWeArGkXg==
-SHA1-Digest-Manifest: pa/31Ll1PYx0dPBQ6C+fd1/wJO4=
-SHA256-Digest-Manifest: DJELIyswfwgeL0kaRqogXW2bzUKhn+Pickfv6WHBsW8=
-

toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/bootstrap.js

@@ -0,0 +1,10 @@
+/* exported startup, shutdown, install, uninstall */
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+function startup(data, reason) {
+  Services.prefs.setIntPref("webapitest.active_version", 1);
+}
+
+function shutdown(data, reason) {
+  Services.prefs.setIntPref("webapitest.active_version", 0);
+}

toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/install.rdf

@@ -0,0 +1,29 @@
+<?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>webapi_install@tests.mozilla.org</em:id>
+    <em:version>1.1</em:version>
+    <em:name>AddonManger web API test</em:name>
+    <em:bootstrap>true</em:bootstrap>
+
+    <em:targetApplication>
+      <Description>
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+        <em:minVersion>0.3</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <em:targetApplication>
+      <Description>
+        <em:id>toolkit@mozilla.org</em:id>
+        <em:minVersion>0</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+  </Description>
+</RDF>

toolkit/mozapps/extensions/test/browser/addons/options_signed/META-INF/manifest.mf

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-
-Name: manifest.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: Rnoaa6yWePDor5y5/SLFaw==
-SHA1-Digest: k51DtKj7bYrwkFJDdmYNDQeUBlA=
-
-Name: options.html
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: vTjxWlRpioEhTZGKTNUqIw==
-SHA1-Digest: Y/mr6A34LsvekgRpdhyZRwPF1Vw=
-

toolkit/mozapps/extensions/test/browser/addons/options_signed/META-INF/mozilla.sf

@@ -1,4 +0,0 @@
-Signature-Version: 1.0
-MD5-Digest-Manifest: rdmx8VMNzkZ5tRf7tt8G1w==
-SHA1-Digest-Manifest: gjtTe8X9Tg46Hz2h4Tru3T02hmE=
-

toolkit/mozapps/extensions/test/browser/browser.ini

@@ -1,16 +1,7 @@
 [DEFAULT]
 tags = addons
 support-files =
-  addons/browser_bug596336_1.xpi
-  addons/browser_bug596336_2.xpi
-  addons/browser_dragdrop1.xpi
-  addons/browser_dragdrop2.xpi
-  addons/browser_dragdrop_incompat.xpi
-  addons/browser_installssl.xpi
-  addons/browser_theme.xpi
-  addons/browser_update1_1.xpi
-  addons/browser_update1_2.xpi
-  addons/options_signed.xpi
+  addons/*
   addon_prefs.xul
   discovery.html
   head.js
@@ -36,18 +27,6 @@ support-files =
   !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/amosigned-restart-required.xpi
 
-generated-files =
-  addons/browser_bug596336_1.xpi
-  addons/browser_bug596336_2.xpi
-  addons/browser_dragdrop1.xpi
-  addons/browser_dragdrop2.xpi
-  addons/browser_dragdrop_incompat.xpi
-  addons/browser_installssl.xpi
-  addons/browser_theme.xpi
-  addons/browser_update1_1.xpi
-  addons/browser_update1_2.xpi
-  addons/options_signed.xpi
-
 [browser_CTP_plugins.js]
 tags = blocklist
 [browser_bug523784.js]

toolkit/mozapps/extensions/test/browser/browser_webapi_install.js

@@ -1,11 +1,10 @@
 const TESTPAGE = `${SECURE_TESTROOT}webapi_checkavailable.html`;
-const XPI_URL = `${SECURE_TESTROOT}../xpinstall/amosigned.xpi`;
+const XPI_URL = `${SECURE_TESTROOT}addons/browser_webapi_install.xpi`;
+const XPI_SHA = "sha256:d4bab17ff9ba5f635e97c84021f4c527c502250d62ab7f6e6c9e8ee28822f772";
 
-const XPI_SHA = "sha256:91121ed2c27f670f2307b9aebdd30979f147318c7fb9111c254c14ddbb84e4b0";
-
-const ID = "amosigned-xpi@tests.mozilla.org";
+const ID = "webapi_install@tests.mozilla.org";
 // eh, would be good to just stat the real file instead of this...
-const XPI_LEN = 4287;
+const XPI_LEN = 4782;
 
 function waitForClear() {
   const MSG = "WebAPICleanup";
@@ -39,10 +38,6 @@ add_task(async function setup() {
 // with properties that the AddonInstall object is expected to have when
 // that event is triggered.
 async function testInstall(browser, args, steps, description) {
-  promisePopupNotificationShown("addon-webext-permissions").then(panel => {
-    panel.button.click();
-  });
-
   let success = await ContentTask.spawn(browser, {args, steps}, async function(opts) {
     let { args, steps } = opts;
     let install = await content.navigator.mozAddonManager.createInstall(args);
@@ -208,21 +203,24 @@ function makeRegularTest(options, what) {
 
     await promptPromise;
 
+    let version = Services.prefs.getIntPref("webapitest.active_version");
+    is(version, 1, "the install really did work");
+
     // Sanity check to ensure that the test in makeInstallTest() that
     // installs.size == 0 means we actually did clean up.
     ok(AddonManager.webAPI.installs.size > 0, "webAPI is tracking the AddonInstall");
 
-    let addon = await promiseAddonByID(ID);
-    isnot(addon, null, "Found the addon");
+    let addons = await promiseAddonsByIDs([ID]);
+    isnot(addons[0], null, "Found the addon");
 
     // Check that the expected installTelemetryInfo has been stored in the addon details.
-    Assert.deepEqual(addon.installTelemetryInfo, {source: "test-host", method: "amWebAPI"},
+    Assert.deepEqual(addons[0].installTelemetryInfo, {source: "test-host", method: "amWebAPI"},
                      "Got the expected addon.installTelemetryInfo");
 
-    await addon.uninstall();
+    await addons[0].uninstall();
 
-    addon = await promiseAddonByID(ID);
-    is(addon, null, "Addon was uninstalled");
+    addons = await promiseAddonsByIDs([ID]);
+    is(addons[0], null, "Addon was uninstalled");
   });
 }
 

toolkit/mozapps/extensions/test/browser/moz.build

@@ -7,29 +7,3 @@
 BROWSER_CHROME_MANIFESTS += [
     'browser.ini',
 ]
-
-addons = [
-    'browser_bug596336_1',
-    'browser_bug596336_2',
-    'browser_dragdrop1',
-    'browser_dragdrop2',
-    'browser_dragdrop_incompat',
-    'browser_installssl',
-    'browser_theme',
-    'browser_update1_1',
-    'browser_update1_2',
-    'options_signed',
-]
-
-output_dir = OBJDIR_FILES._tests.testing.mochitest.browser.toolkit.mozapps.extensions.test.browser.addons
-
-for addon in addons:
-    indir = 'addons/%s' % addon
-    xpi = '%s.xpi' % indir
-
-    GENERATED_FILES += [xpi]
-    GENERATED_FILES[xpi].script = '../create_xpi.py'
-    GENERATED_FILES[xpi].inputs = [indir]
-
-    output_dir += ['!%s' % xpi]
-

toolkit/mozapps/extensions/test/create_xpi.py

@@ -1,14 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from os.path import abspath
-
-from mozbuild.action.zip import main as create_zip
-
-def main(output, input_dir):
-    output.close()
-
-    return create_zip(['-C', input_dir, abspath(output.name), '**'])