Skip to content

Commit

Permalink
Copy disable_fission changes from mozilla-central
Browse files Browse the repository at this point in the history 
For some reason, this change never got upstreamed, so manually
create a PR that updates these files to match mozilla-central.
  • Loading branch information
@jgraham
jgraham committed Oct 6, 2023
1 parent 32cc40a commit c8a1dca
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 29 deletions.
33 changes: 14 additions & 19 deletions tools/wptrunner/wptrunner/browsers/firefox.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs)
"certutil_binary": kwargs["certutil_binary"],
"ca_certificate_path": config.ssl_config["ca_cert_path"],
"e10s": kwargs["gecko_e10s"],
"enable_fission": run_info_data["fission"],
"disable_fission": kwargs["disable_fission"],
"stackfix_dir": kwargs["stackfix_dir"],
"binary_args": kwargs["binary_args"].copy(),
"timeout_multiplier": get_timeout_multiplier(test_type,
Expand Down Expand Up @@ -174,6 +174,7 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data,
executor_kwargs["ccov"] = run_info_data.get("ccov", False)
executor_kwargs["browser_version"] = run_info_data.get("browser_version")
executor_kwargs["debug_test"] = kwargs["debug_test"]
executor_kwargs["disable_fission"] = kwargs["disable_fission"]
return executor_kwargs


Expand Down Expand Up @@ -203,18 +204,13 @@ def get_bool_pref(pref):
pref_value = get_bool_pref_if_exists(pref)
return pref_value if pref_value is not None else False

# Default fission to on, unless we get --[no-]enable-fission or
# --set-pref fission.autostart=[true|false]
enable_fission = [item for item in [kwargs.get("enable_fission"),
get_bool_pref_if_exists("fission.autostart"),
True] if item is not None][0]

# Default fission to on, unless we get --disable-fission
rv = {"e10s": kwargs["gecko_e10s"],
"wasm": kwargs.get("wasm", True),
"verify": kwargs["verify"],
"headless": kwargs.get("headless", False) or "MOZ_HEADLESS" in os.environ,
"fission": enable_fission,
"sessionHistoryInParent": (enable_fission or
"fission": not kwargs.get("disable_fission"),
"sessionHistoryInParent": (not kwargs.get("disable_fission") or
not get_bool_pref("fission.disableSessionHistoryInParent")),
"swgl": get_bool_pref("gfx.webrender.software")}

Expand Down Expand Up @@ -610,15 +606,15 @@ def __call__(self, line):

class ProfileCreator:
def __init__(self, logger, prefs_root, config, test_type, extra_prefs, e10s,
enable_fission, debug_test, browser_channel, binary, certutil_binary,
disable_fission, debug_test, browser_channel, binary, certutil_binary,
ca_certificate_path):
self.logger = logger
self.prefs_root = prefs_root
self.config = config
self.test_type = test_type
self.extra_prefs = extra_prefs
self.e10s = e10s
self.enable_fission = enable_fission
self.disable_fission = disable_fission
self.debug_test = debug_test
self.browser_channel = browser_channel
self.ca_certificate_path = ca_certificate_path
Expand Down Expand Up @@ -693,9 +689,8 @@ def _set_required_prefs(self, profile):
if self.e10s:
profile.set_preferences({"browser.tabs.remote.autostart": True})

if self.enable_fission:
profile.set_preferences({"fission.autostart": True})
else:
profile.set_preferences({"fission.autostart": True})
if self.disable_fission:
profile.set_preferences({"fission.autostart": False})

if self.test_type in ("reftest", "print-reftest"):
Expand All @@ -707,7 +702,7 @@ def _set_required_prefs(self, profile):
# Bug 1262954: winxp + e10s, disable hwaccel
if (self.e10s and platform.system() in ("Windows", "Microsoft") and
"5.1" in platform.version()):
self.profile.set_preferences({"layers.acceleration.disabled": True})
profile.set_preferences({"layers.acceleration.disabled": True})

if self.debug_test:
profile.set_preferences({"devtools.console.stdout.content": True})
Expand Down Expand Up @@ -769,7 +764,7 @@ class FirefoxBrowser(Browser):

def __init__(self, logger, binary, prefs_root, test_type, extra_prefs=None, debug_info=None,
symbols_path=None, stackwalk_binary=None, certutil_binary=None,
ca_certificate_path=None, e10s=False, enable_fission=True,
ca_certificate_path=None, e10s=False, disable_fission=False,
stackfix_dir=None, binary_args=None, timeout_multiplier=None, leak_check=False,
asan=False, chaos_mode_flags=None, config=None,
browser_channel="nightly", headless=None, preload_browser=False,
Expand Down Expand Up @@ -799,7 +794,7 @@ def __init__(self, logger, binary, prefs_root, test_type, extra_prefs=None, debu
test_type,
extra_prefs,
e10s,
enable_fission,
disable_fission,
debug_test,
browser_channel,
binary,
Expand Down Expand Up @@ -872,7 +867,7 @@ class FirefoxWdSpecBrowser(WebDriverBrowser):
def __init__(self, logger, binary, prefs_root, webdriver_binary, webdriver_args,
extra_prefs=None, debug_info=None, symbols_path=None, stackwalk_binary=None,
certutil_binary=None, ca_certificate_path=None, e10s=False,
enable_fission=False, stackfix_dir=None, leak_check=False,
disable_fission=False, stackfix_dir=None, leak_check=False,
asan=False, chaos_mode_flags=None, config=None,
browser_channel="nightly", headless=None, debug_test=False, **kwargs):

Expand All @@ -896,7 +891,7 @@ def __init__(self, logger, binary, prefs_root, webdriver_binary, webdriver_args,
"wdspec",
extra_prefs,
e10s,
enable_fission,
disable_fission,
debug_test,
browser_channel,
binary,
Expand Down
18 changes: 12 additions & 6 deletions tools/wptrunner/wptrunner/browsers/firefox_android.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
run_info_data,
**kwargs),
"e10s": run_info_data["e10s"],
"disable_fission": kwargs["disable_fission"],
# desktop only
"leak_check": False,
"chaos_mode_flags": kwargs["chaos_mode_flags"],
Expand Down Expand Up @@ -113,9 +114,9 @@ def get_environ(chaos_mode_flags, env_extras=None):

class ProfileCreator(FirefoxProfileCreator):
def __init__(self, logger, prefs_root, config, test_type, extra_prefs,
enable_fission, debug_test, browser_channel, certutil_binary, ca_certificate_path):
disable_fission, debug_test, browser_channel, certutil_binary, ca_certificate_path):
super().__init__(logger, prefs_root, config, test_type, extra_prefs,
True, enable_fission, debug_test, browser_channel, None,
True, disable_fission, debug_test, browser_channel, None,
certutil_binary, ca_certificate_path)

def _set_required_prefs(self, profile):
Expand All @@ -141,6 +142,10 @@ def _set_required_prefs(self, profile):
"layout.testing.overlay-scrollbars.always-visible": True,
})

profile.set_preferences({"fission.autostart": True})
if self.disable_fission:
profile.set_preferences({"fission.autostart": False})


class FirefoxAndroidBrowser(Browser):
init_timeout = 300
Expand All @@ -153,7 +158,7 @@ def __init__(self, logger, prefs_root, test_type, package_name="org.mozilla.geck
binary_args=None, timeout_multiplier=None, leak_check=False, asan=False,
chaos_mode_flags=None, config=None, browser_channel="nightly",
install_fonts=False, tests_root=None, specialpowers_path=None, adb_binary=None,
debug_test=False, **kwargs):
debug_test=False, disable_fission=False, **kwargs):

super().__init__(logger)
self.prefs_root = prefs_root
Expand All @@ -178,13 +183,14 @@ def __init__(self, logger, prefs_root, test_type, package_name="org.mozilla.geck
self.tests_root = tests_root
self.specialpowers_path = specialpowers_path
self.adb_binary = adb_binary
self.disable_fission = disable_fission

self.profile_creator = ProfileCreator(logger,
prefs_root,
config,
test_type,
extra_prefs,
False,
disable_fission,
debug_test,
browser_channel,
certutil_binary,
Expand Down Expand Up @@ -309,7 +315,7 @@ class FirefoxAndroidWdSpecBrowser(FirefoxWdSpecBrowser):
def __init__(self, logger, prefs_root, webdriver_binary, webdriver_args,
extra_prefs=None, debug_info=None, symbols_path=None, stackwalk_binary=None,
certutil_binary=None, ca_certificate_path=None, e10s=False,
enable_fission=False, stackfix_dir=None, leak_check=False,
disable_fission=False, stackfix_dir=None, leak_check=False,
asan=False, chaos_mode_flags=None, config=None,
browser_channel="nightly", headless=None,
package_name="org.mozilla.geckoview.test_runner", device_serial=None,
Expand All @@ -319,7 +325,7 @@ def __init__(self, logger, prefs_root, webdriver_binary, webdriver_args,
extra_prefs=extra_prefs, debug_info=debug_info, symbols_path=symbols_path,
stackwalk_binary=stackwalk_binary, certutil_binary=certutil_binary,
ca_certificate_path=ca_certificate_path, e10s=e10s,
enable_fission=enable_fission, stackfix_dir=stackfix_dir,
disable_fission=disable_fission, stackfix_dir=stackfix_dir,
leak_check=leak_check, asan=asan,
chaos_mode_flags=chaos_mode_flags, config=config,
browser_channel=browser_channel, headless=headless, **kwargs)
Expand Down
5 changes: 1 addition & 4 deletions tools/wptrunner/wptrunner/wptcommandline.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,7 @@ def create_parser(product_choices=None):
default=None, help="Don't preload a gecko instance for faster restarts")
gecko_group.add_argument("--disable-e10s", dest="gecko_e10s", action="store_false", default=True,
help="Run tests without electrolysis preferences")
gecko_group.add_argument("--enable-fission", dest="enable_fission", action="store_true", default=None,
help="Enable fission in Gecko (defaults to enabled; "
"this option only exists for backward compatibility).")
gecko_group.add_argument("--no-enable-fission", dest="enable_fission", action="store_false",
gecko_group.add_argument("--disable-fission", dest="disable_fission", action="store_true", default=False,
help="Disable fission in Gecko.")
gecko_group.add_argument("--stackfix-dir", dest="stackfix_dir", action="store",
help="Path to directory containing assertion stack fixing scripts")
Expand Down

0 comments on commit c8a1dca

Please sign in to comment.