Backed out 2 changesets (bug 1549855) for failing Android mochitests on robocop_text_page.html CLOSED TREE
authorarthur.iakab <aiakab@mozilla.com>
Fri, 17 May 2019 02:06:35 +0300
changeset 474249 440aa7a30693d06e6aef4bc256edc226f407ef49
parent 474248 31cf332c9b21698336c5e6c18939a3a8b58a7902
child 474250 c215a31ef6ea248566743ad6f9fd471e356c7b80
push id113144
push usershindli@mozilla.com
push dateFri, 17 May 2019 16:44:55 +0000
treeherdermozilla-inbound@f4c4b796f845 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1549855
milestone68.0a1
backs out928038c23227504c1cd7dff5f5e214501bb4b688
9383ea5938fe62e6d29fb9ebb143b304b9070529
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
Backed out 2 changesets (bug 1549855) for failing Android mochitests on robocop_text_page.html CLOSED TREE Backed out changeset 928038c23227 (bug 1549855) Backed out changeset 9383ea5938fe (bug 1549855)
accessible/tests/browser/head.js
mobile/android/chrome/content/browser.js
testing/marionette/harness/marionette_harness/runner/base.py
testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
toolkit/components/extensions/test/xpcshell/head_e10s.js
--- a/accessible/tests/browser/head.js
+++ b/accessible/tests/browser/head.js
@@ -10,17 +10,18 @@
 /**
  * Set e10s related preferences in the test environment.
  * @return {Promise} promise that resolves when preferences are set.
  */
 function setE10sPrefs() {
   return new Promise(resolve =>
     SpecialPowers.pushPrefEnv({
       set: [
-        ["browser.tabs.remote.autostart", true]
+        ["browser.tabs.remote.autostart", true],
+        ["browser.tabs.remote.force-enable", true]
       ]
     }, resolve));
 }
 
 /**
  * Unset e10s related preferences in the test environment.
  * @return {Promise} promise that resolves when preferences are unset.
  */
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3614,17 +3614,17 @@ Tab.prototype = {
       return;
 
     aParams = aParams || {};
 
     this.browser = document.createElement("browser");
     this.browser.setAttribute("type", "content");
     this.browser.setAttribute("messagemanagergroup", "browsers");
 
-    if (Preferences.get("browser.tabs.remote.autostart", false)) {
+    if (Preferences.get("browser.tabs.remote.force-enable", false)) {
       this.browser.setAttribute("remote", "true");
     }
 
     this.browser.permanentKey = {};
 
     // Check if we have a "parent" window which we need to set as our opener
     if ("opener" in aParams) {
       this.browser.presetOpenerWindow(aParams.opener);
--- a/testing/marionette/harness/marionette_harness/runner/base.py
+++ b/testing/marionette/harness/marionette_harness/runner/base.py
@@ -566,16 +566,17 @@ class BaseMarionetteTestRunner(object):
         # self.e10s stores the desired configuration, whereas
         # self._e10s_from_browser is the cached value from querying e10s
         # in self.is_e10s
         self.e10s = e10s
         self._e10s_from_browser = None
         if self.e10s:
             self.prefs.update({
                 'browser.tabs.remote.autostart': True,
+                'browser.tabs.remote.force-enable': True,
             })
 
         # If no repeat has been set, default to 30 extra runs
         if self.run_until_failure and repeat is None:
             self.repeat = 30
 
         def gather_debug(test, status):
             # No screenshots and page source for skipped tests
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
@@ -453,16 +453,17 @@ def test_catch_invalid_test_names(runner
 
 
 @pytest.mark.parametrize('e10s', (True, False))
 def test_option_e10s_sets_prefs(mach_parsed_kwargs, e10s):
     mach_parsed_kwargs['e10s'] = e10s
     runner = MarionetteTestRunner(**mach_parsed_kwargs)
     e10s_prefs = {
         'browser.tabs.remote.autostart': True,
+        'browser.tabs.remote.force-enable': True,
     }
     for k,v in e10s_prefs.iteritems():
         assert runner.prefs.get(k, False) == (v and e10s)
 
 
 def test_option_e10s_clash_raises(mock_runner):
     mock_runner._e10s_from_browser = False
 
--- a/toolkit/components/extensions/test/xpcshell/head_e10s.js
+++ b/toolkit/components/extensions/test/xpcshell/head_e10s.js
@@ -1,8 +1,10 @@
 "use strict";
 
 /* globals ExtensionTestUtils */
 
-// xpcshell disables e10s by default. Turn it on.
-Services.prefs.setBoolPref("browser.tabs.remote.autostart", true);
+// We want to force enable e10s so we can test remote extensions
+Services.prefs.setBoolPref("browser.tabs.remote.force-enable", true);
+// This causes nsIXULRuntime.browserTabsRemoteAutostart to reset and force e10s
+Services.prefs.setStringPref("e10s.rollout.cohort", "xpcshell-test");
 
 ExtensionTestUtils.remoteContentScripts = true;