initial version of an install and uninstall hook

recipe-client-addon/lib/NormandyDriver.jsm

@@ -156,6 +156,39 @@ this.NormandyDriver = function(sandboxManager) {
       sandboxManager.removeHold(`setTimeout-${token}`);
     },
 
+    /*
+     * Return a promise that resolves to an Addon ID if installation is successful.
+     */
+    installAddon: sandboxManager.wrapAsync(async function installAddon(installUrl) {
+      const installObj = await AddonManager.getInstallForURL(installUrl, null, "application/x-xpinstall");
+      const result = new Promise((resolve, reject) => installObj.addListener({
+        onInstallEnded(addonInstall, addon) {
+          resolve(addon.id);
+        },
+        onInstallFailed(addonInstall) {
+          reject(`AddonInstall error code: [${addonInstall.error}]`);
+        },
+        onDownloadFailed() {
+          reject(`Download failed: [${installUrl}]`);
+        },
+      }));
+      installObj.install();
+      return result;
+    }),
+
+    /*
+     * Return a promise that resolves to a success messsage if
+     * addon uninstall is successful.
+     */
+    uninstallAddon: sandboxManager.wrapAsync(async function uninstallAddon(addonId) {
+      const addon = await AddonManager.getAddonByID(addonId);
+      if (addon === null) {
+        throw new Error(`No addon with ID [${addonId}] found.`);
+      }
+      addon.uninstall();
+      return null;
+    }),
+
     // Sampling
     ratioSample: sandboxManager.wrapAsync(Sampling.ratioSample),
 

recipe-client-addon/test/browser/browser.ini

@@ -1,13 +1,14 @@
 [DEFAULT]
+support-files =
+  action_server.sjs
+  fixtures/normandy.xpi
 head = head.js
 [browser_NormandyDriver.js]
 [browser_FilterExpressions.js]
 [browser_EventEmitter.js]
 [browser_Storage.js]
 [browser_Heartbeat.js]
 [browser_RecipeRunner.js]
-support-files =
-  action_server.sjs
 [browser_LogManager.js]
 [browser_ClientEnvironment.js]
 [browser_ShieldRecipeClient.js]

recipe-client-addon/test/browser/browser_NormandyDriver.js

@@ -12,6 +12,46 @@ add_task(withDriver(Assert, async function uuids(driver) {
   isnot(uuid1, uuid2, "uuids are unique");
 }));
 
+add_task(withDriver(Assert, async function installXpi(driver) {
+  // Test that we can install an XPI from any URL
+  const dir = getChromeDir(getResolvedURI(gTestPath));
+  dir.append("fixtures");
+  dir.append("normandy.xpi");
+  const xpiUrl = Services.io.newFileURI(dir).spec;
+  var addonId = await driver.installAddon(xpiUrl);
+  is(addonId, "normandydriver@example.com", "Expected test addon was installed");
+  isnot(addonId, null, "Addon install was successful");
+
+  // Installing kicks off an asychronous process which tries to read the manifest.json
+  // to startup the addon. Note that onInstallEnded is triggered too early
+  // which is why we need this delay.
+  await new Promise(resolve => SimpleTest.executeSoon(resolve));
+
+  const uninstallMsg = await driver.uninstallAddon(addonId);
+  is(uninstallMsg, null, `Uninstall returned an unexpected message [${uninstallMsg}]`);
+}));
+
+add_task(withDriver(Assert, async function uninstallInvalidAddonId(driver) {
+  const invalidAddonId = "not_a_valid_xpi_id@foo.bar";
+  try {
+    await driver.uninstallAddon(invalidAddonId);
+    ok(false, `Uninstalling an invalid XPI should fail.  uninstallAddon resolved successfully though.`);
+  } catch (e) {
+    ok(true, `This is the expected failure`);
+  }
+}));
+
+
+add_task(withDriver(Assert, async function installXpiBadURL(driver) {
+  const xpiUrl = "file:///tmp/invalid_xpi.xpi";
+  try {
+    await driver.installAddon(xpiUrl);
+    ok(false, "Installation succeeded on an XPI that doesn't exist");
+  } catch (reason) {
+    ok(true, `Installation was rejected: [${reason}]`);
+  }
+}));
+
 add_task(withDriver(Assert, async function userId(driver) {
   // Test that userId is a UUID
   ok(UUID_REGEX.test(driver.userId), "userId is a uuid");

recipe-client-addon/test/browser/fixtures/addon-fixture/manifest.json

@@ -0,0 +1,11 @@
+{
+    "manifest_version": 2,
+    "name": "normandy_fixture",
+    "version": "1.0",
+    "description": "Dummy test fixture that's a webextension",
+    "applications": {
+        "gecko": {
+            "id": "normandydriver@example.com"
+        }
+    }
+}