diff --git a/browser/components/tabview/test/browser.ini b/browser/components/tabview/test/browser.ini index d8b11e52fb54..1ff67d017ef4 100644 --- a/browser/components/tabview/test/browser.ini +++ b/browser/components/tabview/test/browser.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = e10s # Most of these tests fail due to Bug ?????? - SessionStore is disabled in e10s support-files = dummy_page.html head.js @@ -23,6 +22,7 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug587990.js] [browser_tabview_bug588265.js] [browser_tabview_bug589324.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug590606.js] [browser_tabview_bug591706.js] [browser_tabview_bug593283.js] @@ -36,6 +36,7 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug595930.js] [browser_tabview_bug595943.js] [browser_tabview_bug595965.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug596781.js] [browser_tabview_bug597360.js] [browser_tabview_bug597399.js] @@ -56,6 +57,7 @@ skip-if = true # Bug 704417 [browser_tabview_bug607108.js] skip-if = os == 'linux' # Bug 947521 [browser_tabview_bug608037.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug608153.js] [browser_tabview_bug608158.js] [browser_tabview_bug608184.js] @@ -74,12 +76,14 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug619937.js] [browser_tabview_bug622835.js] [browser_tabview_bug623768.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug624265_perwindowpb.js] skip-if = true # Bug 921984, hopefully fixed by bug 930202 [browser_tabview_bug624692.js] [browser_tabview_bug624727_perwindowpb.js] skip-if = buildapp == 'mulet' [browser_tabview_bug624847.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug624931.js] [browser_tabview_bug624953.js] [browser_tabview_bug625195.js] @@ -88,6 +92,7 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug625955.js] [browser_tabview_bug626368.js] [browser_tabview_bug626455.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug626525.js] [browser_tabview_bug626791.js] skip-if = buildapp == 'mulet' @@ -173,6 +178,7 @@ skip-if = buildapp == 'mulet' skip-if = os == "mac" || os == "win" # Bug 945687 [browser_tabview_launch.js] [browser_tabview_multiwindow_search.js] +skip-if = e10s # Bug 1086190 [browser_tabview_pending_tabs.js] [browser_tabview_privatebrowsing_perwindowpb.js] skip-if = os == 'linux' || e10s # linux: Bug 944300; e10s: bug ?????? - "leaked until shutdown [nsGlobalWindow #82 about:blank]" diff --git a/browser/components/tabview/test/browser_tabview_firstrun_pref.js b/browser/components/tabview/test/browser_tabview_firstrun_pref.js index 24b27cf5a6d4..36a43f22d907 100644 --- a/browser/components/tabview/test/browser_tabview_firstrun_pref.js +++ b/browser/components/tabview/test/browser_tabview_firstrun_pref.js @@ -63,9 +63,8 @@ function endGame() { } function newWindowWithTabView(callback, completeCallback) { - let charsetArg = "charset=" + window.content.document.characterSet; let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no,height=800,width=800", - "about:blank", charsetArg, null, null, true); + "about:blank", null, null, null, true); let onLoad = function() { win.removeEventListener("load", onLoad, false); let onShown = function() { diff --git a/browser/components/tabview/test/browser_tabview_startup_transitions.js b/browser/components/tabview/test/browser_tabview_startup_transitions.js index a57e29466892..7eef96934316 100644 --- a/browser/components/tabview/test/browser_tabview_startup_transitions.js +++ b/browser/components/tabview/test/browser_tabview_startup_transitions.js @@ -9,10 +9,9 @@ function animateZoom() prefsBranch.getBoolPref("animate_zoom"); function test() { waitForExplicitFinish(); - - let charsetArg = "charset=" + window.content.document.characterSet; + let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", - "about:blank", charsetArg, null, null, true); + "about:blank", null, null, null, true); registerCleanupFunction(function() { prefsBranch.setBoolPref("animate_zoom", true);