From 5abed3268db70e01516facc175d254d7e3ce8a53 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Thu, 26 Apr 2012 12:10:08 +0100
Subject: [PATCH] Backout 8cc13f37bc66 (bug 746177), 2b5ee44bdc4e (bug 746977),
 3c330e379fa3 (bug 746974), af0a722c0b95 (bug 746971), 269a49a7dc59 (bug
 746534), e23e7fe11364 (bug 746531), 014ef60b82cd (bug 746970), db2c5fd694d6
 (bug 746519), 7c165c01e13c (bug 746183), 247098e91bb5 (bug 746178),
 b761b5f4aeb2 (bug 746176), 5b623170c1d4 (bug 746164) for mochitest-other
 orange

---
 accessible/tests/mochitest/actions/test_keys.html         | 4 ++--
 accessible/tests/mochitest/bounds/test_zoom.html          | 8 --------
 .../tests/mochitest/events/test_focus_autocomplete.xul    | 4 ++--
 .../tests/mochitest/events/test_focus_browserui.xul       | 4 ----
 .../tests/mochitest/events/test_focus_contextmenu.xul     | 7 -------
 accessible/tests/mochitest/events/test_focus_general.html | 4 ++--
 accessible/tests/mochitest/events/test_focus_general.xul  | 4 ----
 .../tests/mochitest/events/test_focus_listcontrols.xul    | 6 ------
 accessible/tests/mochitest/events/test_focus_selects.html | 7 -------
 accessible/tests/mochitest/events/test_focus_tabbox.xul   | 6 ------
 accessible/tests/mochitest/hittest/test_general.html      | 4 ----
 accessible/tests/mochitest/hittest/test_zoom.html         | 4 ----
 accessible/tests/mochitest/tree/test_cssoverflow.html     | 7 -------
 13 files changed, 6 insertions(+), 63 deletions(-)

diff --git a/accessible/tests/mochitest/actions/test_keys.html b/accessible/tests/mochitest/actions/test_keys.html
index df9fc2bf7c0..c963b6c0898 100644
--- a/accessible/tests/mochitest/actions/test_keys.html
+++ b/accessible/tests/mochitest/actions/test_keys.html
@@ -26,8 +26,8 @@
     function doTest()
     {
       testKeyboardShortcut("input1", "");
-      testKeyboardShortcut("input2", MAC ? "⌃⌥b" : "Alt+Shift+b");
-      testKeyboardShortcut("link", MAC ? "⌃⌥l" : "Alt+Shift+l");
+      testKeyboardShortcut("input2", MAC ? "⌃%b" : "Alt+Shift+b");
+      testKeyboardShortcut("link", MAC ? "⌃%l" : "Alt+Shift+l");
 
       SimpleTest.finish();
     }
diff --git a/accessible/tests/mochitest/bounds/test_zoom.html b/accessible/tests/mochitest/bounds/test_zoom.html
index 98aac03a272..872ee26a373 100644
--- a/accessible/tests/mochitest/bounds/test_zoom.html
+++ b/accessible/tests/mochitest/bounds/test_zoom.html
@@ -22,14 +22,6 @@
   <script type="application/javascript">
     function doTest()
     {
-      // Bug 746176: Failure of this whole test file on OS X.
-      if (MAC) {
-        todo(false, "Fix bug 746176 on Mac");
-        closeBrowserWindow();
-        SimpleTest.finish();
-        return;
-      }
-
       var tabDocument = currentTabDocument();
       var p1 = tabDocument.getElementById("p1");
       var p2 = tabDocument.getElementById("p2");
diff --git a/accessible/tests/mochitest/events/test_focus_autocomplete.xul b/accessible/tests/mochitest/events/test_focus_autocomplete.xul
index aaa37d23250..f4cb0326f12 100644
--- a/accessible/tests/mochitest/events/test_focus_autocomplete.xul
+++ b/accessible/tests/mochitest/events/test_focus_autocomplete.xul
@@ -384,8 +384,8 @@
     var gInitQueue = null;
     function initTests()
     {
-      if (SEAMONKEY || MAC) {
-        todo(false, "Skipping this test on SeaMonkey ftb. (Bug 718237), and on Mac (bug 746177)");
+      if (SEAMONKEY) {
+        todo(false, "Skipping this test on SeaMonkey ftb. (Bug 718237)");
         shutdownAutoComplete();
         SimpleTest.finish();
         return;
diff --git a/accessible/tests/mochitest/events/test_focus_browserui.xul b/accessible/tests/mochitest/events/test_focus_browserui.xul
index 15302c1b5e0..6f8d59f19ce 100644
--- a/accessible/tests/mochitest/events/test_focus_browserui.xul
+++ b/accessible/tests/mochitest/events/test_focus_browserui.xul
@@ -96,7 +96,6 @@
       // back one page in history, moves moves on input of tab document
       gQueue.push(new goBack());
 
-if (!MAC) {
       // open new tab, focus moves to urlbar
       gQueue.push(new synthKey(tabDocument, "t", { ctrlKey: true, window: browserWindow() },
                                new focusChecker(urlbarInput)));
@@ -104,9 +103,6 @@ if (!MAC) {
       // close open tab, focus goes on input of tab document
       gQueue.push(new synthKey(tabDocument, "w", { ctrlKey: true, window: browserWindow() },
                                new focusChecker(inputInDocument)));
-} else {
-      todo(false, "Reenable on Mac after fixing bug 746178!");
-}
 
       gQueue.onFinish = function()
       {
diff --git a/accessible/tests/mochitest/events/test_focus_contextmenu.xul b/accessible/tests/mochitest/events/test_focus_contextmenu.xul
index ecacadbcce2..48373ab9d45 100644
--- a/accessible/tests/mochitest/events/test_focus_contextmenu.xul
+++ b/accessible/tests/mochitest/events/test_focus_contextmenu.xul
@@ -27,13 +27,6 @@
     var gQueue = null;
     function doTests()
     {
-      // bug 746183 - Whole file times out on OS X
-      if (MAC) {
-        todo(false, "Reenable on mac after fixing bug 746183!");
-        SimpleTest.finish();
-        return;
-      }
-
       // Test focus events.
       gQueue = new eventQueue();
 
diff --git a/accessible/tests/mochitest/events/test_focus_general.html b/accessible/tests/mochitest/events/test_focus_general.html
index 55f71d5f7b5..b525f459232 100644
--- a/accessible/tests/mochitest/events/test_focus_general.html
+++ b/accessible/tests/mochitest/events/test_focus_general.html
@@ -109,8 +109,8 @@
       if (SEAMONKEY) {
         todo(false, "shift tab from editable document fails on (Windows) SeaMonkey! (Bug 718235)");
       } else {
-      if (LINUX || MAC)
-        todo(false, "shift tab from editable document fails on linux and Mac, bug 746519!");
+      if (LINUX)
+        todo(false, "shift tab from editable document fails on linux!");
       else
         gQueue.push(new synthShiftTab("link", new focusChecker("link")));
       } // ! SEAMONKEY
diff --git a/accessible/tests/mochitest/events/test_focus_general.xul b/accessible/tests/mochitest/events/test_focus_general.xul
index d069ef688fc..98e8e4ed164 100644
--- a/accessible/tests/mochitest/events/test_focus_general.xul
+++ b/accessible/tests/mochitest/events/test_focus_general.xul
@@ -73,7 +73,6 @@
       // show popup again for the next test
       gQueue.push(new synthClick("popupbutton", new nofocusChecker()));
 
-if (MAC) {
       // click menubutton of the 'menubutton' button while popup of button open.
       gQueue.push(new synthClick("mbb", new focusChecker("mbb"), { where: "right" }));
       // close popup, focus stays on menubutton, fire focus event
@@ -90,9 +89,6 @@ if (MAC) {
       gQueue.push(new synthUpKey("menubutton", new focusChecker("mbb_item2")));
       // click on menu item of menubutton menu, focus menubutton
       gQueue.push(new synthClick("mbb_item2", new focusChecker("mbb")));
-} else {
-      todo(false, "mbb tests time out on OS X, fix bug 746970 and reenable!");
-}
 
       // focus colorpicker button
       gQueue.push(new synthFocus("colorpicker"));
diff --git a/accessible/tests/mochitest/events/test_focus_listcontrols.xul b/accessible/tests/mochitest/events/test_focus_listcontrols.xul
index fa0e73a971d..4b9fe7eae46 100644
--- a/accessible/tests/mochitest/events/test_focus_listcontrols.xul
+++ b/accessible/tests/mochitest/events/test_focus_listcontrols.xul
@@ -50,13 +50,9 @@
       gQueue.push(new synthClick("menulist", new focusChecker("ml_tangerine")));
       gQueue.push(new synthDownKey("ml_tangerine", new focusChecker("ml_marmalade")));
       gQueue.push(new synthEscapeKey("ml_marmalade", new focusChecker("menulist")));
-if (MAC) {
       gQueue.push(new synthDownKey("menulist", new nofocusChecker("ml_marmalade")));
       gQueue.push(new synthOpenComboboxKey("menulist", new focusChecker("ml_marmalade")));
       gQueue.push(new synthEnterKey("ml_marmalade", new focusChecker("menulist")));
-} else {
-      todo(false, "Bug 746531 - timeouts of last three menulist tests on OS X");
-}
 
       var textentry = getAccessible("emenulist").firstChild;
       gQueue.push(new synthFocus("emenulist", new focusChecker(textentry)));
@@ -72,9 +68,7 @@ if (MAC) {
 
       gQueue.push(new changeCurrentItem("listbox", "lb_item1"));
       gQueue.push(new changeCurrentItem("richlistbox", "rlb_item1"));
-if (!MAC) {
       gQueue.push(new changeCurrentItem("menulist", "ml_tangerine"));
-}
       gQueue.push(new changeCurrentItem("emenulist", "eml_tangerine"));
 
       gQueue.invoke(); // Will call SimpleTest.finish();
diff --git a/accessible/tests/mochitest/events/test_focus_selects.html b/accessible/tests/mochitest/events/test_focus_selects.html
index ef742c4b2ed..0a7043633a4 100644
--- a/accessible/tests/mochitest/events/test_focus_selects.html
+++ b/accessible/tests/mochitest/events/test_focus_selects.html
@@ -28,13 +28,6 @@
 
     function doTests()
     {
-      // Bug 746534 - File causes crash or hang on OS X
-      if (MAC) {
-        todo(false, "Bug 746534 - test file causes crash or hang on OS X");
-        SimpleTest.finish();
-        return;
-      }
-
       gQueue = new eventQueue();
 
       // first item is focused until there's selection
diff --git a/accessible/tests/mochitest/events/test_focus_tabbox.xul b/accessible/tests/mochitest/events/test_focus_tabbox.xul
index 9bf8cef14b2..ba771a22531 100644
--- a/accessible/tests/mochitest/events/test_focus_tabbox.xul
+++ b/accessible/tests/mochitest/events/test_focus_tabbox.xul
@@ -27,12 +27,6 @@
     var gQueue = null;
     function doTests()
     {
-      if (MAC) {
-        todo(false, "Tests disabled because of imminent failure.");
-        SimpleTest.finish();
-        return;
-      }
-
       // Test focus events.
       gQueue = new eventQueue();
 
diff --git a/accessible/tests/mochitest/hittest/test_general.html b/accessible/tests/mochitest/hittest/test_general.html
index 29a099430a9..1ca2af6b670 100644
--- a/accessible/tests/mochitest/hittest/test_general.html
+++ b/accessible/tests/mochitest/hittest/test_general.html
@@ -19,11 +19,7 @@
       var list = getAccessible("list");
       var listitem = getAccessible("listitem");
       var image = getAccessible("image");
-if (!MAC) {
       testChildAtPoint(list, 1, 1, listitem, image.firstChild);
-} else {
-      todo(false, "Bug 746974 - children must match on all platforms, disable failing test on Mac");
-}
 
       // ::MustPrune case (in this case childAtPoint doesn't look inside a
       // textbox), point is inside of textbox.
diff --git a/accessible/tests/mochitest/hittest/test_zoom.html b/accessible/tests/mochitest/hittest/test_zoom.html
index bc1cf9d556a..3a19e17c3b8 100644
--- a/accessible/tests/mochitest/hittest/test_zoom.html
+++ b/accessible/tests/mochitest/hittest/test_zoom.html
@@ -20,7 +20,6 @@
   <script type="application/javascript">
     function doTest()
     {
-if (!MAC) {
       var tabDocument = currentTabDocument();
       var p1 = tabDocument.body.firstElementChild;
       var p2 = tabDocument.body.lastElementChild;
@@ -34,9 +33,6 @@ if (!MAC) {
       hitTest(tabDocument, p2, p2.firstChild);
 
       closeBrowserWindow();
-} else {
-      todo(false, "Bug 746974 - deepest child must be correct on all platforms, disabling on Mac!");
-}
       SimpleTest.finish();
     }
 
diff --git a/accessible/tests/mochitest/tree/test_cssoverflow.html b/accessible/tests/mochitest/tree/test_cssoverflow.html
index c67128fbc52..7d58147138e 100644
--- a/accessible/tests/mochitest/tree/test_cssoverflow.html
+++ b/accessible/tests/mochitest/tree/test_cssoverflow.html
@@ -87,13 +87,6 @@
 
     function doTests()
     {
-      // Shift+Tab not working, and a test timeout, bug 746977
-      if (MAC) {
-        todo(false, "Shift+tab isn't working on OS X, needs to be disabled until bug 746977 is fixed!");
-        SimpleTest.finish();
-        return;
-      }
-
       gQueue = new eventQueue();
 
       // CSS 'overflow: scroll' property setting and unsetting causes accessible