From 347d8a3faf01afa52c9963fc332a55ac462d0c06 Mon Sep 17 00:00:00 2001 From: Mike Jackson Date: Wed, 31 Jan 2024 20:32:59 -0800 Subject: [PATCH] Remove IE App --- tools/wpt/browser.py | 25 ---------- tools/wpt/run.py | 22 +++++++- tools/wptrunner/requirements_ie.txt | 2 - tools/wptrunner/tox.ini | 3 +- .../wptrunner/wptrunner/browsers/__init__.py | 1 - tools/wptrunner/wptrunner/browsers/ie.py | 50 ------------------- 6 files changed, 22 insertions(+), 81 deletions(-) delete mode 100644 tools/wptrunner/requirements_ie.txt delete mode 100644 tools/wptrunner/wptrunner/browsers/ie.py diff --git a/tools/wpt/browser.py b/tools/wpt/browser.py index d4c0244953dfa61..c7f67d334e13a6c 100644 --- a/tools/wpt/browser.py +++ b/tools/wpt/browser.py @@ -1856,31 +1856,6 @@ def webdriver_version(self, webdriver_binary): return m.group(1) -class InternetExplorer(Browser): - """Internet Explorer-specific interface.""" - - product = "ie" - requirements = "requirements_ie.txt" - - def download(self, dest=None, channel=None, rename=None): - raise NotImplementedError - - def install(self, dest=None, channel=None): - raise NotImplementedError - - def find_binary(self, venv_path=None, channel=None): - raise NotImplementedError - - def find_webdriver(self, venv_path=None, channel=None): - return which("IEDriverServer.exe") - - def install_webdriver(self, dest=None, channel=None, browser_binary=None): - raise NotImplementedError - - def version(self, binary=None, webdriver_binary=None): - return None - - class Safari(Browser): """Safari-specific interface. diff --git a/tools/wpt/run.py b/tools/wpt/run.py index c2452a6f8c3a58f..4838f296a773482 100644 --- a/tools/wpt/run.py +++ b/tools/wpt/run.py @@ -726,9 +726,15 @@ def setup_kwargs(self, kwargs): kwargs["binary_args"].append("--no-sandbox") +<<<<<<< HEAD class InternetExplorer(BrowserSetup): name = "ie" browser_cls = browser.InternetExplorer +======= +class Edge(BrowserSetup): + name = "edge" + browser_cls = browser.Edge +>>>>>>> ec44981b17 (Remove IE App) def install(self, channel=None): raise NotImplementedError @@ -739,14 +745,29 @@ def setup_kwargs(self, kwargs): if webdriver_binary is None: raise WptrunError("""Unable to find WebDriver and we aren't yet clever enough to work out which +<<<<<<< HEAD version to download. Please go to the following URL and install the driver for Internet Explorer somewhere on the %PATH%: https://selenium-release.storage.googleapis.com/index.html +======= +version to download. Please go to the following URL and install the correct +version for your Edge/Windows release somewhere on the %PATH%: + +https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/ +>>>>>>> ec44981b17 (Remove IE App) """) kwargs["webdriver_binary"] = webdriver_binary +<<<<<<< HEAD +======= +class EdgeWebDriver(Edge): + name = "edge_webdriver" + browser_cls = browser.EdgeWebDriver + + +>>>>>>> ec44981b17 (Remove IE App) class Safari(BrowserSetup): name = "safari" browser_cls = browser.Safari @@ -898,7 +919,6 @@ def setup_kwargs(self, kwargs): "chromium": Chromium, "content_shell": ContentShell, "edgechromium": EdgeChromium, - "ie": InternetExplorer, "safari": Safari, "servo": Servo, "servodriver": ServoWebDriver, diff --git a/tools/wptrunner/requirements_ie.txt b/tools/wptrunner/requirements_ie.txt deleted file mode 100644 index 4ff0fedd321ab3a..000000000000000 --- a/tools/wptrunner/requirements_ie.txt +++ /dev/null @@ -1,2 +0,0 @@ -mozprocess==1.3.1 -selenium==4.14.0 diff --git a/tools/wptrunner/tox.ini b/tools/wptrunner/tox.ini index ef80a889459e61d..82d3ac6f555ac76 100644 --- a/tools/wptrunner/tox.ini +++ b/tools/wptrunner/tox.ini @@ -2,7 +2,7 @@ xfail_strict=true [tox] -envlist = py311-{base,chrome,firefox,ie,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py37,py38,py39,py310}-base +envlist = py311-{base,chrome,firefox,opera,safari,sauce,servo,webkit,webkitgtk_minibrowser,epiphany},{py37,py38,py39,py310}-base skip_missing_interpreters = False [testenv] @@ -11,7 +11,6 @@ deps = -r{toxinidir}/requirements.txt chrome: -r{toxinidir}/requirements_chromium.txt firefox: -r{toxinidir}/requirements_firefox.txt - ie: -r{toxinidir}/requirements_ie.txt opera: -r{toxinidir}/requirements_opera.txt safari: -r{toxinidir}/requirements_safari.txt sauce: -r{toxinidir}/requirements_sauce.txt diff --git a/tools/wptrunner/wptrunner/browsers/__init__.py b/tools/wptrunner/wptrunner/browsers/__init__.py index 451343461e458e6..81dc549d730fc4d 100644 --- a/tools/wptrunner/wptrunner/browsers/__init__.py +++ b/tools/wptrunner/wptrunner/browsers/__init__.py @@ -32,7 +32,6 @@ "edgechromium", "firefox", "firefox_android", - "ie", "safari", "sauce", "servo", diff --git a/tools/wptrunner/wptrunner/browsers/ie.py b/tools/wptrunner/wptrunner/browsers/ie.py deleted file mode 100644 index 87b989c028b0eda..000000000000000 --- a/tools/wptrunner/wptrunner/browsers/ie.py +++ /dev/null @@ -1,50 +0,0 @@ -# mypy: allow-untyped-defs - -from .base import require_arg, WebDriverBrowser -from .base import get_timeout_multiplier # noqa: F401 -from ..executors import executor_kwargs as base_executor_kwargs -from ..executors.base import WdspecExecutor # noqa: F401 - -__wptrunner__ = {"product": "ie", - "check_args": "check_args", - "browser": "WebDriverBrowser", - "executor": {"wdspec": "WdspecExecutor"}, - "browser_kwargs": "browser_kwargs", - "executor_kwargs": "executor_kwargs", - "env_extras": "env_extras", - "env_options": "env_options", - "timeout_multiplier": "get_timeout_multiplier"} - - -def check_args(**kwargs): - require_arg(kwargs, "webdriver_binary") - - -def browser_kwargs(logger, test_type, run_info_data, config, **kwargs): - return {"webdriver_binary": kwargs["webdriver_binary"], - "webdriver_args": kwargs.get("webdriver_args")} - - -def executor_kwargs(logger, test_type, test_environment, run_info_data, - **kwargs): - options = {} - options["requireWindowFocus"] = True - capabilities = {} - capabilities["se:ieOptions"] = options - executor_kwargs = base_executor_kwargs(test_type, test_environment, run_info_data, **kwargs) - executor_kwargs["close_after_done"] = True - executor_kwargs["capabilities"] = capabilities - return executor_kwargs - - -def env_extras(**kwargs): - return [] - - -def env_options(): - return {"supports_debugger": False} - - -class InternetExplorerBrowser(WebDriverBrowser): - def make_command(self): - return [self.binary, f"--port={self.port}"] + self.webdriver_args