Merge branch 'trunk' into fixing_cdp_generation_for_python

Author: diemol

.github/workflows/ci-python.yml

@@ -86,7 +86,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - browser: firefox
+          - browser: chrome
     with:
       name: Integration Tests (remote, ${{ matrix.browser }})
       browser: ${{ matrix.browser }}

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')

py/BUILD.bazel

@@ -363,7 +363,6 @@ py_library(
         "test/selenium/webdriver/common/network.py",
         "test/selenium/webdriver/common/webserver.py",
         "test/selenium/webdriver/firefox/__init__.py",
-        "test/selenium/webdriver/firefox/conftest.py",
         "test/selenium/webdriver/marionette/__init__.py",
         "test/selenium/webdriver/marionette/conftest.py",
         "test/selenium/webdriver/safari/conftest.py",

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"
 
@@ -249,8 +249,8 @@ def options(self, cls_name):
                 # under Wayland, so we use XWayland instead.
                 os.environ["MOZ_ENABLE_WAYLAND"] = "0"
         elif self.driver_class == self.supported_drivers.remote:
-            self._options = getattr(webdriver, self.supported_options.firefox)()
-            self._options.set_capability("moz:firefoxOptions", {})
+            self._options = getattr(webdriver, self.supported_options.chrome)()
+            self._options.set_capability("goog:chromeOptions", {})
             self._options.enable_downloads = True
         else:
             opts_cls = getattr(self.supported_options, cls_name.lower())
@@ -467,6 +467,7 @@ def clean_driver(request):
         pytest.xfail(**marker.kwargs)
 
     yield driver_reference
+
     if request.node.get_closest_marker("no_driver_after_test"):
         driver_reference = None
 

py/pyproject.toml

@@ -24,15 +24,15 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
-    ]
+]
 dependencies = [
     "urllib3[socks]>=2.5.0,<3.0",
     "trio>=0.31.0,<1.0",
     "trio-websocket>=0.12.2,<1.0",
     "certifi>=2025.10.5",
     "typing_extensions>=4.15.0,<5.0",
     "websocket-client>=1.8.0,<2.0",
-    ]
+]
 
 [project.urls]
 homepage = "https://www.selenium.dev"

py/test/selenium/webdriver/common/api_example_tests.py

@@ -258,19 +258,20 @@ def test_move_window_position(driver, pages):
     assert loc["y"] == new_y
 
 
-@pytest.mark.xfail_edge(reason="Window does not resize")
+@pytest.mark.xfail_edge(reason="Window sometimes does not resize")
+@pytest.mark.xfail_remote(reason="Window sometimes does not resize")
 def test_change_window_size(driver, pages):
     pages.load("blank.html")
     size = driver.get_window_size()
-    newSize = [600, 600]
+    new_size = [600, 600]
     if size["width"] == 600:
-        newSize[0] = 500
+        new_size[0] = 500
     if size["height"] == 600:
-        newSize[1] = 500
-    driver.set_window_size(newSize[0], newSize[1])
+        new_size[1] = 500
+    driver.set_window_size(new_size[0], new_size[1])
     size = driver.get_window_size()
-    assert size["width"] == newSize[0]
-    assert size["height"] == newSize[1]
+    assert size["width"] == new_size[0]
+    assert size["height"] == new_size[1]
 
 
 @pytest.mark.xfail_ie(raises=AttributeError, reason="Logging API is no longer available")

py/test/selenium/webdriver/firefox/conftest.py

@@ -18,12 +18,21 @@
 import os
 import zipfile
 
+import pytest
+
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
 
-extensions = os.path.abspath("../../../../../../test/extensions/")
+for extensions_dir in (
+    os.path.abspath("../../../../../../test/extensions/"),
+    os.path.abspath("../common/extensions/"),
+):
+    extensions = extensions_dir
+    if os.path.exists(extensions_dir):
+        break
 
 
+@pytest.mark.no_driver_after_test
 def test_install_uninstall_signed_addon_xpi(driver, pages):
     extension = os.path.join(extensions, "webextensions-selenium-example.xpi")
 
@@ -41,6 +50,7 @@ def test_install_uninstall_signed_addon_xpi(driver, pages):
     assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0
 
 
+@pytest.mark.no_driver_after_test
 def test_install_uninstall_signed_addon_zip(driver, pages):
     extension = os.path.join(extensions, "webextensions-selenium-example.zip")
 
@@ -58,6 +68,7 @@ def test_install_uninstall_signed_addon_zip(driver, pages):
     assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0
 
 
+@pytest.mark.no_driver_after_test
 def test_install_uninstall_unsigned_addon_zip(driver, pages):
     extension = os.path.join(extensions, "webextensions-selenium-example-unsigned.zip")
 
@@ -75,6 +86,7 @@ def test_install_uninstall_unsigned_addon_zip(driver, pages):
     assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0
 
 
+@pytest.mark.no_driver_after_test
 def test_install_uninstall_signed_addon_dir(driver, pages):
     zip = os.path.join(extensions, "webextensions-selenium-example.zip")
 
@@ -96,6 +108,7 @@ def test_install_uninstall_signed_addon_dir(driver, pages):
     assert len(driver.find_elements(By.ID, "webextensions-selenium-example")) == 0
 
 
+@pytest.mark.no_driver_after_test
 def test_install_uninstall_unsigned_addon_dir(driver, pages):
     zip = os.path.join(extensions, "webextensions-selenium-example-unsigned.zip")
     target = os.path.join(extensions, "webextensions-selenium-example-unsigned-unzip")

py/test/selenium/webdriver/firefox/ff_installs_addons_tests.py

@@ -27,16 +27,18 @@
 from selenium.webdriver.remote.client_config import ClientConfig
 
 
-def test_browser_specific_method(driver, pages):
+def test_browser_specific_method(firefox_options, webserver):
     """This only works on Firefox"""
-    pages.load("simpleTest.html")
-    screenshot = driver.execute("FULL_PAGE_SCREENSHOT")["value"]
-    result = base64.b64decode(screenshot)
-    kind = filetype.guess(result)
-    assert kind is not None and kind.mime == "image/png"
+    server_addr = f"http://{webserver.host}:{webserver.port}"
+    with webdriver.Remote(options=firefox_options) as driver:
+        driver.get(f"{server_addr}/simpleTest.html")
+        screenshot = driver.execute("FULL_PAGE_SCREENSHOT")["value"]
+        result = base64.b64decode(screenshot)
+        kind = filetype.guess(result)
+        assert kind is not None and kind.mime == "image/png"
 
 
-def test_remote_webdriver_with_http_timeout(firefox_options, webserver):
+def test_remote_webdriver_with_http_timeout(chromium_options, webserver):
     """This test starts a remote webdriver with an http client timeout
     set less than the implicit wait timeout, and verifies the http timeout
     is triggered first when waiting for an element.
@@ -46,14 +48,14 @@ def test_remote_webdriver_with_http_timeout(firefox_options, webserver):
     server_addr = f"http://{webserver.host}:{webserver.port}"
     client_config = ClientConfig(remote_server_addr=server_addr, timeout=http_timeout)
     assert client_config.timeout == http_timeout
-    with webdriver.Remote(options=firefox_options, client_config=client_config) as driver:
+    with webdriver.Remote(options=chromium_options, client_config=client_config) as driver:
         driver.get(f"{server_addr}/simpleTest.html")
         driver.implicitly_wait(wait_timeout)
         with pytest.raises(ReadTimeoutError):
             driver.find_element(By.ID, "no_element_to_be_found")
 
 
-def test_remote_webdriver_with_websocket_timeout(firefox_options, webserver):
+def test_remote_webdriver_with_websocket_timeout(chromium_options, webserver):
     """This test starts a remote webdriver that uses websockets, and has a websocket
     client timeout less than the default. It verifies the websocket times out according
     to this value.
@@ -66,8 +68,8 @@ def test_remote_webdriver_with_websocket_timeout(firefox_options, webserver):
         remote_server_addr=server_addr, websocket_timeout=websocket_timeout, websocket_interval=websocket_interval
     )
     assert client_config.websocket_timeout == websocket_timeout
-    firefox_options.enable_bidi = True
-    with webdriver.Remote(options=firefox_options, client_config=client_config) as driver:
+    chromium_options.enable_bidi = True
+    with webdriver.Remote(options=chromium_options, client_config=client_config) as driver:
         driver._start_bidi()
         assert driver._websocket_connection.response_wait_timeout == websocket_timeout
         assert driver._websocket_connection.response_wait_interval == websocket_interval

py/test/selenium/webdriver/remote/remote_connection_tests.py

@@ -30,8 +30,8 @@ def convert(self, by, value):
 
 
 @pytest.fixture()
-def custom_locator_driver(firefox_options):
-    driver = webdriver.Remote(options=firefox_options, locator_converter=CustomLocatorConverter())
+def custom_locator_driver(chromium_options):
+    driver = webdriver.Remote(options=chromium_options, locator_converter=CustomLocatorConverter())
     yield driver
     driver.quit()