Backed out changesets 1cf7e08007f9 and 981fc919965e (bug 1271777) for browser_ext_commands_onCommand.js failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 26 May 2016 23:54:39 -0400
changeset 340271 cca36be27a57c6d85c018261adf5ab20cbd42eeb
parent 340270 945c510ffa9b4af93cb438331af18ac82f4db59c
child 340272 67bf9ee1756489deb5ca3bface784702f1f52a26
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1271777
milestone49.0a1
backs out1cf7e08007f9b63d228f9e42a9b501c22a48da92
981fc919965e7f3276afe6fb882f6f19ad35bb36
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
Backed out changesets 1cf7e08007f9 and 981fc919965e (bug 1271777) for browser_ext_commands_onCommand.js failures.
browser/components/extensions/schemas/commands.json
browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
--- a/browser/components/extensions/schemas/commands.json
+++ b/browser/components/extensions/schemas/commands.json
@@ -6,17 +6,17 @@
   {
     "namespace": "manifest",
     "types": [
      {
         "id": "KeyName",
         "choices": [
           {
             "type": "string",
-            "pattern": "^\\s*(Alt|Ctrl|Command|MacCtrl)\\s*\\+\\s*(Shift\\s*\\+\\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\\s*$"
+            "pattern": "^\\s*(Alt|Ctrl|Command|MacCtr)\\s*\\+\\s*(Shift\\s*\\+\\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\\s*$"
           },
           {
             "type": "string",
             "pattern": "^(MediaNextTrack|MediaPlayPause|MediaPrevTrack|MediaStop)$"
           }
         ]
       },
       {
--- a/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
+++ b/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
@@ -1,61 +1,38 @@
 /* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-Cu.import("resource://gre/modules/AppConstants.jsm");
-
 add_task(function* test_user_defined_commands() {
   // Create a window before the extension is loaded.
   let win1 = yield BrowserTestUtils.openNewBrowserWindow();
   yield BrowserTestUtils.loadURI(win1.gBrowser.selectedBrowser, "about:robots");
   yield BrowserTestUtils.browserLoaded(win1.gBrowser.selectedBrowser);
 
-  let commands = {
-    "toggle-feature-using-alt-shift-3": {
-      "suggested_key": {
-        "default": "Alt+Shift+3",
-      },
-    },
-    "toggle-feature-using-control-shift-4": {
-      "suggested_key": {
-        "default": "Ctrl+Shift+4",
-      },
-    },
-    "toggle-feature-using-control-page-up": {
-      "suggested_key": {
-        "default": "Ctrl+PageUp",
-      },
-    },
-    "toggle-feature-using-alt-shift-comma": {
-      "suggested_key": {
-        "default": "Alt+Shift+Comma",
-      },
-      "unrecognized_property": "with-a-random-value",
-    },
-    "toggle-feature-with-whitespace-in-suggested-key": {
-      "suggested_key": {
-        "default": "  Alt + Shift + 2  ",
-      },
-    },
-  };
-
-  // Register the Mac OS-X specific commands.
-  if (AppConstants.platform == "macosx") {
-    commands["toggle-feature-using-mac-control-5"] = {
-      "suggested_key": {
-        "default": "MacCtrl+5",
-      },
-    };
-  }
-
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
-      "commands": commands,
+      "commands": {
+        "toggle-feature-using-alt-shift-3": {
+          "suggested_key": {
+            "default": "Alt+Shift+3",
+          },
+        },
+        "toggle-feature-using-alt-shift-comma": {
+          "suggested_key": {
+            "default": "Alt+Shift+Comma",
+          },
+          "unrecognized_property": "with-a-random-value",
+        },
+        "toggle-feature-with-whitespace-in-suggested-key": {
+          "suggested_key": {
+            "default": "  Alt + Shift + 2  ",
+          },
+        },
+      },
     },
 
     background: function() {
       browser.commands.onCommand.addListener(commandName => {
         browser.test.sendMessage("oncommand", commandName);
       });
       browser.test.sendMessage("ready");
     },
@@ -76,43 +53,28 @@ add_task(function* test_user_defined_com
   let win2 = yield BrowserTestUtils.openNewBrowserWindow();
   yield BrowserTestUtils.loadURI(win2.gBrowser.selectedBrowser, "about:config");
   yield BrowserTestUtils.browserLoaded(win2.gBrowser.selectedBrowser);
 
   // Confirm the keysets have been added to both windows.
   let keysetID = `ext-keyset-id-${makeWidgetId(extension.id)}`;
   let keyset = win1.document.getElementById(keysetID);
   ok(keyset != null, "Expected keyset to exist");
-  is(keyset.childNodes.length, 6, "Expected keyset to have the correct number of children");
+  is(keyset.childNodes.length, 3, "Expected keyset to have 3 children");
 
   keyset = win2.document.getElementById(keysetID);
   ok(keyset != null, "Expected keyset to exist");
-  is(keyset.childNodes.length, 6, "Expected keyset to have the correct number of children");
+  is(keyset.childNodes.length, 3, "Expected keyset to have 3 children");
 
   // Confirm that the commands are registered to both windows.
   yield focusWindow(win1);
   EventUtils.synthesizeKey("3", {altKey: true, shiftKey: true});
   let message = yield extension.awaitMessage("oncommand");
   is(message, "toggle-feature-using-alt-shift-3", "Expected onCommand listener to fire with correct message");
 
-  EventUtils.synthesizeKey("4", {accelKey: true, shiftKey: true});
-  message = yield extension.awaitMessage("oncommand");
-  is(message, "toggle-feature-using-control-shift-4", "Expected onCommand listener to fire with correct message");
-
-  EventUtils.synthesizeKey("VK_PAGE_UP", {accelKey: true});
-  message = yield extension.awaitMessage("oncommand");
-  is(message, "toggle-feature-using-control-page-up", "Expected onCommand listener to fire with correct message");
-
-  // Test the Mac OS-X specific shortcut.
-  if (AppConstants.platform == "macosx") {
-    EventUtils.synthesizeKey("5", {ctrlKey: true});
-    message = yield extension.awaitMessage("oncommand");
-    is(message, "toggle-feature-using-mac-control-5", "Expected onCommand listener to fire with correct message");
-  }
-
   yield focusWindow(win2);
   EventUtils.synthesizeKey("VK_COMMA", {altKey: true, shiftKey: true});
   message = yield extension.awaitMessage("oncommand");
   is(message, "toggle-feature-using-alt-shift-comma", "Expected onCommand listener to fire with correct message");
 
   EventUtils.synthesizeKey("2", {altKey: true, shiftKey: true});
   message = yield extension.awaitMessage("oncommand");
   is(message, "toggle-feature-with-whitespace-in-suggested-key", "Expected onCommand listener to fire with correct message");