diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml index 744ebbb8372fa..eadbdb55be892 100644 --- a/.github/workflows/ci-python.yml +++ b/.github/workflows/ci-python.yml @@ -81,7 +81,7 @@ jobs: fail-fast: false matrix: include: - - browser: firefox + - browser: chrome with: name: Integration Tests (remote, ${{ matrix.browser }}) browser: ${{ matrix.browser }} diff --git a/Rakefile b/Rakefile index 73936caa4ff04..e0049b3b5bc12 100644 --- a/Rakefile +++ b/Rakefile @@ -685,7 +685,7 @@ namespace :py do end end - desc 'Python Remote tests with Firefox' + desc 'Python Remote tests with Chrome' task :remote do Rake::Task['py:clean'].invoke Bazel.execute('test', [], '//py:test-remote') diff --git a/py/conftest.py b/py/conftest.py index a78c7779c3011..2387002b5a96d 100644 --- a/py/conftest.py +++ b/py/conftest.py @@ -131,7 +131,7 @@ class SupportedOptions(ContainerProtocol): edge: str = "EdgeOptions" safari: str = "SafariOptions" ie: str = "IeOptions" - remote: str = "FirefoxOptions" + remote: str = "ChromeOptions" webkitgtk: str = "WebKitGTKOptions" wpewebkit: str = "WPEWebKitOptions" @@ -327,7 +327,18 @@ def driver(request): pytest.skip(f"{driver_class} does not support BiDi") # conditionally mark tests as expected to fail based on driver - marker = request.node.get_closest_marker(f"xfail_{driver_class.lower()}") + # For Remote, respect both Chrome and Remote specific markers + if driver_class == "remote": + marker_names = ["xfail_chrome", "xfail_remote"] + else: + marker_names = [f"xfail_{driver_class.lower()}"] + + marker = None + for name in marker_names: + found = request.node.get_closest_marker(name) + if found is not None: + marker = found + break if marker is not None: if "run" in marker.kwargs: if marker.kwargs["run"] is False: