Bug 1303113 - Turn e10s-multi on in Nightly. r=me

addon-sdk/test/browser.ini

@@ -7,6 +7,7 @@ support-files =
   invalid.json
 [browser_sdk_loader_sdk_modules.js]
 [browser_sdk_loader_sdk_gui_modules.js]
+skip-if = e10s # Bug 1315042
 [browser_sdk_loader_jsm_modules.js]
 [browser_sdk_loader_js_modules.js]
 [browser_sdk_loader_json.js]

browser/base/content/test/general/browser.ini

@@ -249,6 +249,7 @@ skip-if = os == "mac" # mac: Intermittent failures, bug 925225
 skip-if = os == "mac" # Bug 1102331 - does focus things on the content window which break in e10s mode (still causes orange on Mac 10.10)
 [browser_bug710878.js]
 [browser_bug719271.js]
+skip-if = e10s # Bug 1315042
 [browser_bug724239.js]
 [browser_bug734076.js]
 [browser_bug735471.js]
@@ -397,6 +398,7 @@ run-if = e10s
 skip-if = os == 'linux' # Bug 1304272
 [browser_tab_close_dependent_window.js]
 [browser_tabDrop.js]
+skip-if = e10s # Bug 1315042
 [browser_tabReorder.js]
 [browser_tab_detach_restore.js]
 [browser_tab_drag_drop_perwindow.js]
@@ -407,8 +409,9 @@ skip-if = buildapp == 'mulet' || (e10s && debug) # Bug 1312436
 skip-if = os == "linux" || os == "mac" # No tabs in titlebar on linux
                                        # Disabled on OS X because of bug 967917
 [browser_tabfocus.js]
+skip-if = e10s # Bug 1315042
 [browser_tabkeynavigation.js]
-skip-if = (os == "mac" && !e10s) # Bug 1237713 - OSX eats keypresses for some reason
+skip-if = true || (os == "mac" && !e10s) # Bug 1315042, Bug 1237713 - OSX eats keypresses for some reason
 [browser_tabopen_reflows.js]
 [browser_tabs_close_beforeunload.js]
 support-files =

browser/base/content/test/plugins/browser.ini

@@ -56,6 +56,7 @@ skip-if = !crashreporter
 [browser_CTP_iframe.js]
 [browser_CTP_multi_allow.js]
 [browser_CTP_nonplugins.js]
+skip-if = e10s # Bug 1315042
 [browser_CTP_notificationBar.js]
 [browser_CTP_outsideScrollArea.js]
 [browser_CTP_remove_navigate.js]

browser/base/content/test/referrer/browser.ini

@@ -6,7 +6,9 @@ support-files =
   head.js
 
 [browser_referrer_middle_click.js]
+skip-if = true # Bug 1315042
 [browser_referrer_middle_click_in_container.js]
+skip-if = true # Bug 1315042
 [browser_referrer_open_link_in_private.js]
 skip-if = os == 'linux' # Bug 1145199
 [browser_referrer_open_link_in_tab.js]

browser/base/content/test/webrtc/browser.ini

@@ -11,4 +11,6 @@ skip-if = (os == "linux" && debug) # linux: bug 976544
 [browser_devices_get_user_media_screen.js]
 skip-if = (e10s && debug) || (os == "linux" && !debug) # bug 1320754 for e10s debug, and bug 1320994 for linux opt
 [browser_devices_get_user_media_tear_off_tab.js]
+skip-if = e10s # Bug 1315042
+
 [browser_webrtc_hooks.js]

browser/components/preferences/in-content/tests/browser_security.js

@@ -50,10 +50,10 @@ add_task(function*() {
     yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
 
-  yield checkPrefSwitch(true, true);
-  yield checkPrefSwitch(false, true);
-  yield checkPrefSwitch(true, false);
-  yield checkPrefSwitch(false, false);
+  yield* checkPrefSwitch(true, true);
+  yield* checkPrefSwitch(false, true);
+  yield* checkPrefSwitch(true, false);
+  yield* checkPrefSwitch(false, false);
 });
 
 // test the download protection preference
@@ -84,8 +84,8 @@ add_task(function*() {
     yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
 
-  yield checkPrefSwitch(true);
-  yield checkPrefSwitch(false);
+  yield* checkPrefSwitch(true);
+  yield* checkPrefSwitch(false);
 });
 
 // test the unwanted/uncommon software warning preference

browser/components/privatebrowsing/test/browser/browser.ini

@@ -26,6 +26,7 @@ tags = trackingprotection
 [browser_privatebrowsing_cache.js]
 [browser_privatebrowsing_certexceptionsui.js]
 [browser_privatebrowsing_concurrent.js]
+skip-if = e10s # Bug 1315042
 [browser_privatebrowsing_context_and_chromeFlags.js]
 [browser_privatebrowsing_crh.js]
 [browser_privatebrowsing_downloadLastDir.js]

devtools/client/aboutdebugging/test/browser_service_workers_status.js

@@ -42,9 +42,11 @@ add_task(function* () {
 
   let targetElement = name.parentNode.parentNode;
   let status = targetElement.querySelector(".target-status");
-  is(status.textContent, "Registering", "Service worker is currently registering");
+  // We might miss the registering state in some setup...
+  if (status.textContent == "Registering") {
+    yield waitForMutation(serviceWorkersElement, { childList: true, subtree: true });
+  }
 
-  yield waitForMutation(serviceWorkersElement, { childList: true, subtree: true });
   is(status.textContent, "Running", "Service worker is currently running");
 
   yield waitForMutation(serviceWorkersElement, { attributes: true, subtree: true });

devtools/client/responsive.html/test/browser/browser.ini

@@ -38,6 +38,7 @@ support-files =
 [browser_toolbox_computed_view.js]
 [browser_toolbox_rule_view.js]
 [browser_toolbox_swap_browsers.js]
+skip-if = true # Bug 1315042
 [browser_touch_simulation.js]
 [browser_viewport_basics.js]
 [browser_window_close.js]

docshell/test/browser/browser_grouped_shistory_dead_navigate.js

@@ -1,6 +1,7 @@
 add_task(function* () {
   yield SpecialPowers.pushPrefEnv({
-    set: [["browser.groupedhistory.enabled", true]]
+    set: [["browser.groupedhistory.enabled", true],
+          ["dom.ipc.processCount", 1]]
   });
 
   // Wait for a process change and then fulfil the promise.

dom/base/test/browser.ini

@@ -20,6 +20,7 @@ tags = mcb
 [browser_bug1011748.js]
 [browser_bug1058164.js]
 [browser_messagemanager_loadprocessscript.js]
+skip-if = e10s # Bug 1315042
 [browser_messagemanager_targetframeloader.js]
 [browser_messagemanager_unload.js]
 [browser_pagehide_on_tab_close.js]

dom/browser-element/mochitest/mochitest-oop.ini

@@ -71,6 +71,7 @@ disabled = disabled for bug 1266035 (bug 1310706 for re-enabling)
 [test_browserElement_oop_OpenTab.html]
 disabled = Disabling some OOP tests for WebIDL scope changes (bug 1310706 for re-enabling)
 [test_browserElement_oop_PrivateBrowsing.html]
+skip-if = true # Bug 1315042
 [test_browserElement_oop_PromptCheck.html]
 [test_browserElement_oop_PromptConfirm.html]
 [test_browserElement_oop_PurgeHistory.html]

dom/cache/test/mochitest/browser.ini

@@ -1 +1,2 @@
 [browser_cache_pb_window.js]
+skip-if = e10s # Bug 1315042

modules/libpref/init/all.js

@@ -2879,7 +2879,11 @@ pref("dom.ipc.plugins.asyncdrawing.enabled", false);
 pref("dom.ipc.plugins.asyncdrawing.enabled", true);
 #endif
 
+#ifdef NIGHTLY_BUILD
+pref("dom.ipc.processCount", 2);
+#else
 pref("dom.ipc.processCount", 1);
+#endif
 
 // Override default dom.ipc.processCount for some remote content process types.
 pref("dom.ipc.processCount.webLargeAllocation", 2);

testing/firefox-ui/tests/functional/security/manifest.ini

@@ -11,6 +11,7 @@ tags = local
 tags = local
 [test_safe_browsing_initial_download.py]
 [test_safe_browsing_notification.py]
+skip-if = e10s # Bug 1315042
 [test_safe_browsing_warning_pages.py]
 [test_security_notification.py]
 [test_ssl_disabled_error_page.py]

toolkit/components/formautofill/test/browser/browser_ui_requestAutocomplete.js

@@ -7,6 +7,12 @@
 
 "use strict";
 
+add_task(function* setup() {
+  yield SpecialPowers.pushPrefEnv({
+    set: [["dom.ipc.processCount", 1]]
+  });
+});
+
 /**
  * Open the requestAutocomplete UI and test that selecting a profile results in
  * the correct data being sent back to the opener.

toolkit/components/passwordmgr/test/browser/browser.ini

@@ -45,6 +45,7 @@ support-files =
 [browser_formless_submit_chrome.js]
 [browser_hasInsecureLoginForms.js]
 [browser_hasInsecureLoginForms_streamConverter.js]
+skip-if = e10s # Bug 1315042
 [browser_http_autofill.js]
 [browser_insecurePasswordWarning.js]
 [browser_notifications.js]

toolkit/mozapps/extensions/test/browser/browser-common.ini

@@ -65,3 +65,4 @@ skip-if = buildapp == 'mulet'
 skip-if = buildapp == 'mulet'
 [browser_webext_options.js]
 tags = webextensions
+skip-if = e10s # Bug 1315042