Bug 1330712 - Always set dom.ipc.keepProcessesAlive in e10s Mochitest browser-chrome. r=krizsa draft
authorAndrew McCreight <continuation@gmail.com>
Thu, 12 Jan 2017 09:30:27 -0800
changeset 459732 98432d90f40adcab499fb289aa646ccc2f69c5c8
parent 457660 2977ca1224525680cbfb5c3ce3018818b6dfd8f2
child 541995 07e7daaa9c2296e74049d4236339fc5f98a37571
push id41329
push userbmo:continuation@gmail.com
push dateThu, 12 Jan 2017 17:38:43 +0000
reviewerskrizsa
bugs1330712
milestone53.0a1
Bug 1330712 - Always set dom.ipc.keepProcessesAlive in e10s Mochitest browser-chrome. r=krizsa MozReview-Commit-ID: DW6kp9Q17ci
testing/mochitest/browser-test.js
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -101,21 +101,21 @@ function testInit() {
     var listener = 'data:,function doLoad(e) { var data=e.detail&&e.detail.data;removeEventListener("contentEvent", function (e) { doLoad(e); }, false, true);sendAsyncMessage("chromeEvent", {"data":data}); };addEventListener("contentEvent", function (e) { doLoad(e); }, false, true);';
     messageManager.loadFrameScript(listener, true);
     messageManager.addMessageListener("chromeEvent", messageHandler);
   }
   if (gConfig.e10s) {
     e10s_init();
 
     let processCount = prefs.getIntPref("dom.ipc.processCount", 1);
-    if (processCount > 1) {
-      // Currently starting a content process is slow, to aviod timeouts, let's
-      // keep alive content processes.
-      prefs.setIntPref("dom.ipc.keepProcessesAlive", processCount);
-    }
+    // Currently starting a content process is slow. To avoid
+    // timeouts, let's keep alive content processes. We do this even
+    // when the process count is 1 to make e10s and e10s-multi
+    // behavior similar during testing.
+    prefs.setIntPref("dom.ipc.keepProcessesAlive", processCount);
 
     let globalMM = Cc["@mozilla.org/globalmessagemanager;1"]
                      .getService(Ci.nsIMessageListenerManager);
     globalMM.loadFrameScript("chrome://mochikit/content/shutdown-leaks-collector.js", true);
   } else {
     // In non-e10s, only run the ShutdownLeaksCollector in the parent process.
     Components.utils.import("chrome://mochikit/content/ShutdownLeaksCollector.jsm");
   }