Bug 621399, modal dialog focus tests sometimes fail on Windows 8 so disable them there
authorNeil Deakin <neil@mozilla.com>
Fri, 06 Sep 2013 09:47:36 -0400
changeset 158853 8645694e9c37353456a518a304b7f1c0c3dd6c4c
parent 158852 11b68cbcab1d004081cfda36112ca276216a5deb
child 158854 7e003256ff7c038aed5b8321e8468578da3e8a4c
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs621399
milestone26.0a1
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
Bug 621399, modal dialog focus tests sometimes fail on Windows 8 so disable them there
dom/tests/mochitest/chrome/window_focus.xul
--- a/dom/tests/mochitest/chrome/window_focus.xul
+++ b/dom/tests/mochitest/chrome/window_focus.xul
@@ -1122,19 +1122,26 @@ function otherWindowFocused(otherWindow)
   is(gEvents, "", "when lowered no events fired");
 
   var other = otherWindow.document.getElementById("other");
   other.focus();
   is(fm.focusedElement, other, "focus method in second window");
 
   otherWindow.close();
 
+  getById("n2").focus();
+
   // next, check modal dialogs
-  getById("n2").focus();
-  var nextWindow = window.openDialog("focus_window2.xul", "_blank", "chrome,modal", modalWindowOpened);
+  // XXXndeakin Bug 621399 - modal dialog test sometimes fails on Windows 8 so disable it.
+  if (navigator.userAgent.indexOf("Windows NT 6.2") >= 0) {
+    window.open("focus_frameset.html", "_blank", "width=400,height=400,toolbar=no");
+  }
+  else {
+    window.openDialog("focus_window2.xul", "_blank", "chrome,modal", modalWindowOpened);
+  }
 }
 
 function modalWindowOpened(modalWindow)
 {
   var elem = modalWindow.document.getElementById("other");
   if (gPartialTabbing)
     elem.focus();
   else