Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
fail-fast: false
matrix:
include:
- browser: firefox
- browser: chrome
with:
name: Integration Tests (remote, ${{ matrix.browser }})
browser: ${{ matrix.browser }}
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
15 changes: 13 additions & 2 deletions py/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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:
Expand Down
Loading