Bug 852847 - Part 1: Disable browserElement_oop_KeyEvents.html. r=pwang a=tef+
☠☠ backed out by a41f9308a042 ☠ ☠
authorJustin Lebar <justin.lebar@gmail.com>
Wed, 27 Mar 2013 07:13:00 +0100
changeset 119131 c5d79650594275eca07f6a4dc2dbf67dd4edfa41
parent 119130 54bdac994f98969781ce435ec81dc9337d71a7ff
child 119132 2449b8d0f7e641831bea91d8faff186a1a3c8a55
push id689
push userjosh@joshmatthews.net
push dateFri, 19 Apr 2013 09:22:05 +0000
reviewerspwang, tef
bugs852847
milestone18.0
Bug 852847 - Part 1: Disable browserElement_oop_KeyEvents.html. r=pwang a=tef+
dom/browser-element/mochitest/Makefile.in
dom/browser-element/mochitest/browserElement_KeyEvents.js
--- a/dom/browser-element/mochitest/Makefile.in
+++ b/dom/browser-element/mochitest/Makefile.in
@@ -159,16 +159,19 @@ MOCHITEST_FILES = \
 		browserElement_ReloadPostRequest.js \
 		browserElement_PurgeHistory.js \
 		test_browserElement_inproc_PurgeHistory.html \
 		$(NULL)
 
 # Disabled due to https://bugzilla.mozilla.org/show_bug.cgi?id=774100
 #		test_browserElement_inproc_Reload.html \
 
+# Disabled due to focus issues (no bug that I'm aware of)
+# 		test_browserElement_oop_KeyEvents.html \
+
 # OOP tests don't work on Windows (bug 763081) or native-fennec (bug
 # 774939).
 #
 # Both the "inproc" and "oop" versions of OpenMixedProcess open remote frames,
 # so we don't run that test on platforms which don't support OOP tests.
 
 ifneq ($(OS_ARCH),WINNT) #{
 ifndef MOZ_ANDROID_OMTC #{
@@ -185,17 +188,16 @@ MOCHITEST_FILES += \
 		test_browserElement_oop_BrowserWindowNamespace.html \
 		test_browserElement_oop_TopBarrier.html \
 		test_browserElement_oop_Iconchange.html \
 		test_browserElement_oop_GetScreenshot.html \
 		test_browserElement_oop_BadScreenshot.html \
 		test_browserElement_oop_SetVisible.html \
 		test_browserElement_oop_SetVisibleFrames.html \
 		test_browserElement_oop_SetVisibleFrames2.html \
-		test_browserElement_oop_KeyEvents.html \
 		test_browserElement_oop_XFrameOptions.html \
 		test_browserElement_oop_XFrameOptionsDeny.html \
 		test_browserElement_oop_XFrameOptionsSameOrigin.html \
 		test_browserElement_oop_XFrameOptionsAllowFrom.html \
 		test_browserElement_oop_FirstPaint.html \
 		test_browserElement_oop_Alert.html \
 		test_browserElement_oop_AlertInFrame.html \
 		test_browserElement_oop_TargetTop.html \
--- a/dom/browser-element/mochitest/browserElement_KeyEvents.js
+++ b/dom/browser-element/mochitest/browserElement_KeyEvents.js
@@ -15,17 +15,16 @@ let whitelistedEvents = [
   Ci.nsIDOMKeyEvent.DOM_VK_PAGE_UP,  // Volume up.
   Ci.nsIDOMKeyEvent.DOM_VK_PAGE_DOWN // Volume down.
 ];
 
 SimpleTest.waitForExplicitFinish();
 
 browserElementTestHelpers.setEnabledPref(true);
 browserElementTestHelpers.addPermission();
-browserElementTestHelpers.setOOPDisabledPref(true); // this is breaking the autofocus.
 
 var iframe = document.createElement('iframe');
 iframe.mozbrowser = true;
 iframe.src = browserElementTestHelpers.focusPage;
 document.body.appendChild(iframe);
 
 // Number of expected events at which point we will consider the test as done.
 var nbEvents = whitelistedEvents.length * 3;
@@ -34,17 +33,16 @@ function eventHandler(e) {
   ok(((e.type == 'keydown' || e.type == 'keypress' || e.type == 'keyup') &&
       !e.defaultPrevented &&
       (whitelistedEvents.indexOf(e.keyCode) != -1)),
       "[ " + e.type + "] Handled event should be a non prevented key event in the white list.");
 
   nbEvents--;
 
   if (nbEvents == 0) {
-    browserElementTestHelpers.restoreOriginalPrefs();
     SimpleTest.finish();
     return;
   }
 
   if (nbEvents < 0) {
     ok(false, "got an unexpected event! " + e.type + " " + e.keyCode);
     SimpleTest.finish();
     return;