mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 1669172 - [marionette] Remove --disable-actors command line argument. r=marionette-reviewers,jdescottes
Differential Revision: https://phabricator.services.mozilla.com/D100943
This commit is contained in:
parent
ddf5147693
commit
6ca4317d5a
@ -15,7 +15,6 @@ from .marionette_test import (
|
||||
skip,
|
||||
skip_if_chrome,
|
||||
skip_if_desktop,
|
||||
skip_if_framescript,
|
||||
SkipTest,
|
||||
skip_unless_browser_pref,
|
||||
skip_unless_protocol,
|
||||
|
@ -17,7 +17,6 @@ from .decorators import (
|
||||
run_if_manage_instance,
|
||||
skip_if_chrome,
|
||||
skip_if_desktop,
|
||||
skip_if_framescript,
|
||||
skip_unless_browser_pref,
|
||||
skip_unless_protocol,
|
||||
with_parameters,
|
||||
|
@ -102,24 +102,6 @@ def skip_if_desktop(reason):
|
||||
return decorator
|
||||
|
||||
|
||||
def skip_if_framescript(reason):
|
||||
"""Decorator which skips a test if the framescript implementation is used."""
|
||||
|
||||
def decorator(test_item):
|
||||
if not isinstance(test_item, types.FunctionType):
|
||||
raise Exception("Decorator only supported for functions")
|
||||
|
||||
@functools.wraps(test_item)
|
||||
def skip_wrapper(self, *args, **kwargs):
|
||||
if self.marionette.get_pref("marionette.actors.enabled") is False:
|
||||
raise SkipTest(reason)
|
||||
return test_item(self, *args, **kwargs)
|
||||
|
||||
return skip_wrapper
|
||||
|
||||
return decorator
|
||||
|
||||
|
||||
def skip_unless_browser_pref(reason, pref, predicate=bool):
|
||||
"""Decorator which skips a test based on the value of a browser preference.
|
||||
|
||||
|
@ -421,13 +421,6 @@ class BaseMarionetteArguments(ArgumentParser):
|
||||
help="Enable python post-mortem debugger when a test fails."
|
||||
" Pass in the debugger you want to use, eg pdb or ipdb.",
|
||||
)
|
||||
self.add_argument(
|
||||
"--disable-actors",
|
||||
action="store_true",
|
||||
dest="disable_actors",
|
||||
default=False,
|
||||
help="Disable the usage of JSWindowActors in Marionette.",
|
||||
)
|
||||
self.add_argument(
|
||||
"--enable-fission",
|
||||
action="store_true",
|
||||
@ -657,7 +650,6 @@ class BaseMarionetteTestRunner(object):
|
||||
verbose=0,
|
||||
emulator=False,
|
||||
headless=False,
|
||||
disable_actors=False,
|
||||
enable_fission=False,
|
||||
enable_webrender=False,
|
||||
**kwargs
|
||||
@ -705,14 +697,6 @@ class BaseMarionetteTestRunner(object):
|
||||
self.headless = headless
|
||||
self.enable_webrender = enable_webrender
|
||||
|
||||
self.disable_actors = disable_actors
|
||||
if self.disable_actors:
|
||||
self.prefs.update(
|
||||
{
|
||||
"marionette.actors.enabled": False,
|
||||
}
|
||||
)
|
||||
|
||||
self.enable_fission = enable_fission
|
||||
if self.enable_fission:
|
||||
self.prefs.update(
|
||||
@ -1154,7 +1138,6 @@ class BaseMarionetteTestRunner(object):
|
||||
"appname": self.appName,
|
||||
"manage_instance": self.marionette.instance is not None,
|
||||
"headless": self.headless,
|
||||
"actors": not self.disable_actors,
|
||||
"webrender": self.enable_webrender,
|
||||
}
|
||||
)
|
||||
|
@ -378,17 +378,9 @@ def test_manifest_basic_args(mock_runner, manifest, monkeypatch):
|
||||
assert kwargs["exists"] is False
|
||||
assert kwargs["disabled"] is True
|
||||
assert kwargs["appname"] == "fake_app"
|
||||
assert kwargs["actors"] is True
|
||||
assert "mozinfo_key" in kwargs and kwargs["mozinfo_key"] == "mozinfo_val"
|
||||
|
||||
|
||||
def test_manifest_actors_disabled(mock_runner, manifest, monkeypatch):
|
||||
kwargs = get_kwargs_passed_to_manifest(
|
||||
mock_runner, manifest, monkeypatch, disable_actors=True
|
||||
)
|
||||
assert kwargs["actors"] is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize("test_tags", (None, ["tag", "tag2"]))
|
||||
def test_manifest_with_test_tags(mock_runner, manifest, monkeypatch, test_tags):
|
||||
kwargs = get_kwargs_passed_to_manifest(
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
from __future__ import absolute_import
|
||||
|
||||
from marionette_driver import By, errors
|
||||
from marionette_driver import By
|
||||
from marionette_driver.keys import Keys
|
||||
|
||||
from marionette_harness import MarionetteTestCase, WindowManagerMixin
|
||||
@ -14,10 +14,6 @@ class TestPointerActions(WindowManagerMixin, MarionetteTestCase):
|
||||
def setUp(self):
|
||||
super(TestPointerActions, self).setUp()
|
||||
|
||||
self.actors_enabled = self.marionette.get_pref("marionette.actors.enabled")
|
||||
if self.actors_enabled is None:
|
||||
self.actors_enabled = True
|
||||
|
||||
self.mouse_chain = self.marionette.actions.sequence(
|
||||
"pointer", "pointer_id", {"pointerType": "mouse"}
|
||||
)
|
||||
@ -34,8 +30,7 @@ class TestPointerActions(WindowManagerMixin, MarionetteTestCase):
|
||||
self.marionette.switch_to_window(self.win)
|
||||
|
||||
def tearDown(self):
|
||||
if self.actors_enabled:
|
||||
self.marionette.actions.release()
|
||||
self.marionette.actions.release()
|
||||
self.close_all_windows()
|
||||
|
||||
super(TestPointerActions, self).tearDown()
|
||||
@ -43,32 +38,24 @@ class TestPointerActions(WindowManagerMixin, MarionetteTestCase):
|
||||
def test_click_action(self):
|
||||
box = self.marionette.find_element(By.ID, "testBox")
|
||||
box.get_property("localName")
|
||||
if self.actors_enabled:
|
||||
self.assertFalse(
|
||||
self.marionette.execute_script(
|
||||
"return document.getElementById('testBox').checked"
|
||||
)
|
||||
self.assertFalse(
|
||||
self.marionette.execute_script(
|
||||
"return document.getElementById('testBox').checked"
|
||||
)
|
||||
self.mouse_chain.click(element=box).perform()
|
||||
self.assertTrue(
|
||||
self.marionette.execute_script(
|
||||
"return document.getElementById('testBox').checked"
|
||||
)
|
||||
)
|
||||
self.mouse_chain.click(element=box).perform()
|
||||
self.assertTrue(
|
||||
self.marionette.execute_script(
|
||||
"return document.getElementById('testBox').checked"
|
||||
)
|
||||
else:
|
||||
with self.assertRaises(errors.UnsupportedOperationException):
|
||||
self.mouse_chain.click(element=box).perform()
|
||||
)
|
||||
|
||||
def test_key_action(self):
|
||||
self.marionette.find_element(By.ID, "textInput").click()
|
||||
if self.actors_enabled:
|
||||
self.key_chain.send_keys("x").perform()
|
||||
self.assertEqual(
|
||||
self.marionette.execute_script(
|
||||
"return document.getElementById('textInput').value"
|
||||
),
|
||||
"testx",
|
||||
)
|
||||
else:
|
||||
with self.assertRaises(errors.UnsupportedOperationException):
|
||||
self.key_chain.send_keys("x").perform()
|
||||
self.key_chain.send_keys("x").perform()
|
||||
self.assertEqual(
|
||||
self.marionette.execute_script(
|
||||
"return document.getElementById('textInput').value"
|
||||
),
|
||||
"testx",
|
||||
)
|
||||
|
@ -15,7 +15,6 @@ from marionette_driver.marionette import Alert
|
||||
from marionette_harness import (
|
||||
MarionetteTestCase,
|
||||
run_if_manage_instance,
|
||||
skip_if_framescript,
|
||||
skip_unless_browser_pref,
|
||||
WindowManagerMixin,
|
||||
)
|
||||
@ -293,7 +292,6 @@ class TestNavigate(BaseNavigationTestCase):
|
||||
self.marionette.navigate("about:robots")
|
||||
self.assertFalse(self.is_remote_tab)
|
||||
|
||||
@skip_if_framescript("Bug 1690308: Won't be fixed for framescript mode")
|
||||
def test_stale_element_after_remoteness_change(self):
|
||||
self.marionette.navigate(self.test_page_file_url)
|
||||
self.assertTrue(self.is_remote_tab)
|
||||
@ -912,7 +910,6 @@ class TestPageLoadStrategy(BaseNavigationTestCase):
|
||||
|
||||
super(TestPageLoadStrategy, self).tearDown()
|
||||
|
||||
@skip_if_framescript("Bug 1675173: Won't be fixed for framescript mode")
|
||||
def test_none(self):
|
||||
self.marionette.delete_session()
|
||||
self.marionette.start_session({"pageLoadStrategy": "none"})
|
||||
|
@ -11,7 +11,6 @@ from marionette_driver.keys import Keys
|
||||
|
||||
from marionette_harness import (
|
||||
MarionetteTestCase,
|
||||
skip_if_framescript,
|
||||
WindowManagerMixin,
|
||||
)
|
||||
|
||||
@ -88,9 +87,6 @@ class TestSendkeysMenupopup(WindowManagerMixin, MarionetteTestCase):
|
||||
self.testwindow_el.send_keys(Keys.ESCAPE)
|
||||
self.wait_for_context_menu_closed()
|
||||
|
||||
@skip_if_framescript(
|
||||
"Bug 1675173: Interactability is only checked with actors enabled"
|
||||
)
|
||||
def test_sendkeys_closed_menu(self):
|
||||
# send_keys should throw for the menupopup if the contextmenu is closed.
|
||||
with self.assertRaises(errors.ElementNotInteractableException):
|
||||
@ -100,9 +96,6 @@ class TestSendkeysMenupopup(WindowManagerMixin, MarionetteTestCase):
|
||||
with self.assertRaises(errors.ElementNotInteractableException):
|
||||
self.menuitem_el.send_keys(Keys.ESCAPE)
|
||||
|
||||
@skip_if_framescript(
|
||||
"Bug 1675173: Interactability is only checked with actors enabled"
|
||||
)
|
||||
def test_sendkeys_hidden_disabled_menuitem(self):
|
||||
self.open_context_menu()
|
||||
|
||||
|
@ -145,15 +145,6 @@ class MarionetteTest(TestingMixin, MercurialScript, TransferMixin, CodeCoverageM
|
||||
"help": "Permits a software GL implementation (such as LLVMPipe) to use the GL compositor.", # NOQA: E501
|
||||
},
|
||||
],
|
||||
[
|
||||
["--disable-actors"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "disable_actors",
|
||||
"default": False,
|
||||
"help": "Disable the usage of JSWindowActors in Marionette.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
@ -351,9 +342,6 @@ class MarionetteTest(TestingMixin, MercurialScript, TransferMixin, CodeCoverageM
|
||||
if self.config.get("app_arg"):
|
||||
config_fmt_args["app_arg"] = self.config["app_arg"]
|
||||
|
||||
if self.config["disable_actors"]:
|
||||
cmd.append("--disable-actors")
|
||||
|
||||
if self.config["enable_webrender"]:
|
||||
cmd.append("--enable-webrender")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user