Merge branch 'trunk' into trunk

Author: AdamPDotty

java/src/org/openqa/selenium/bidi/script/NodeProperties.java

@@ -25,7 +25,7 @@
 public class NodeProperties {
   private enum Mode {
     OPEN("open"),
-    CLOSE("close");
+    CLOSED("closed");
 
     private final String value;
 

java/test/org/openqa/selenium/bidi/browsingcontext/LocateNodesTest.java

@@ -162,8 +162,6 @@ void canLocateNodesWithMaxNodeCount() {
   }
 
   @Test
-  @NotYetImplemented(CHROME)
-  @NotYetImplemented(EDGE)
   void canLocateNodesGivenStartNodes() {
     String handle = driver.getWindowHandle();
     BrowsingContext browsingContext = new BrowsingContext(driver, handle);

py/selenium/webdriver/chromium/remote_connection.py

@@ -30,9 +30,10 @@ def __init__(
         ignore_proxy: Optional[bool] = False,
         client_config: Optional[ClientConfig] = None,
     ) -> None:
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
-            remote_server_addr=remote_server_addr,
-            keep_alive=keep_alive,
             ignore_proxy=ignore_proxy,
             client_config=client_config,
         )

py/selenium/webdriver/firefox/remote_connection.py

@@ -32,9 +32,10 @@ def __init__(
         ignore_proxy: Optional[bool] = False,
         client_config: Optional[ClientConfig] = None,
     ) -> None:
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
-            remote_server_addr=remote_server_addr,
-            keep_alive=keep_alive,
             ignore_proxy=ignore_proxy,
             client_config=client_config,
         )

py/selenium/webdriver/ie/webdriver.py

@@ -16,6 +16,7 @@
 # under the License.
 
 from selenium.webdriver.common.driver_finder import DriverFinder
+from selenium.webdriver.remote.client_config import ClientConfig
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
@@ -49,10 +50,10 @@ def __init__(
         self.service.path = self.service.env_path() or DriverFinder(self.service, options).get_driver_path()
         self.service.start()
 
+        client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
         executor = RemoteConnection(
-            remote_server_addr=self.service.service_url,
-            keep_alive=keep_alive,
             ignore_proxy=options._ignore_local_proxy,
+            client_config=client_config,
         )
 
         try:

py/selenium/webdriver/remote/remote_connection.py

@@ -136,6 +136,18 @@ class RemoteConnection:
     """
 
     browser_name = None
+    # Keep backward compatibility for AppiumConnection - https://github.com/SeleniumHQ/selenium/issues/14694
+    import os
+    import socket
+
+    import certifi
+
+    _timeout = (
+        float(os.getenv("GLOBAL_DEFAULT_TIMEOUT", str(socket.getdefaulttimeout())))
+        if os.getenv("GLOBAL_DEFAULT_TIMEOUT") is not None
+        else socket.getdefaulttimeout()
+    )
+    _ca_certs = os.getenv("REQUESTS_CA_BUNDLE") if "REQUESTS_CA_BUNDLE" in os.environ else certifi.where()
     _client_config: ClientConfig = None
 
     system = platform.system().lower()
@@ -296,6 +308,9 @@ def __init__(
             init_args_for_pool_manager=init_args_for_pool_manager,
         )
 
+        # Keep backward compatibility for AppiumConnection - https://github.com/SeleniumHQ/selenium/issues/14694
+        RemoteConnection._timeout = self._client_config.timeout
+        RemoteConnection._ca_certs = self._client_config.ca_certs
         RemoteConnection._client_config = self._client_config
 
         if remote_server_addr:
@@ -375,7 +390,7 @@ def execute(self, command, params):
         LOGGER.debug("%s %s %s", command_info[0], url, str(trimmed))
         return self._request(command_info[0], url, body=data)
 
-    def _request(self, method, url, body=None, timeout=120):
+    def _request(self, method, url, body=None):
         """Send an HTTP request to the remote server.
 
         :Args:
@@ -397,12 +412,12 @@ def _request(self, method, url, body=None, timeout=120):
             body = None
 
         if self._client_config.keep_alive:
-            response = self._conn.request(method, url, body=body, headers=headers, timeout=timeout)
+            response = self._conn.request(method, url, body=body, headers=headers, timeout=self._client_config.timeout)
             statuscode = response.status
         else:
             conn = self._get_connection_manager()
             with conn as http:
-                response = http.request(method, url, body=body, headers=headers, timeout=timeout)
+                response = http.request(method, url, body=body, headers=headers, timeout=self._client_config.timeout)
             statuscode = response.status
         data = response.data.decode("UTF-8")
         LOGGER.debug("Remote response: status=%s | data=%s | headers=%s", response.status, data, response.headers)

py/selenium/webdriver/safari/remote_connection.py

@@ -32,9 +32,10 @@ def __init__(
         ignore_proxy: Optional[bool] = False,
         client_config: Optional[ClientConfig] = None,
     ) -> None:
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
-            remote_server_addr=remote_server_addr,
-            keep_alive=keep_alive,
             ignore_proxy=ignore_proxy,
             client_config=client_config,
         )

py/selenium/webdriver/safari/webdriver.py

@@ -16,6 +16,7 @@
 # under the License.
 
 from selenium.common.exceptions import WebDriverException
+from selenium.webdriver.remote.client_config import ClientConfig
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
 from ..common.driver_finder import DriverFinder
@@ -50,10 +51,10 @@ def __init__(
         if not self.service.reuse_service:
             self.service.start()
 
+        client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
         executor = SafariRemoteConnection(
-            remote_server_addr=self.service.service_url,
-            keep_alive=keep_alive,
             ignore_proxy=options._ignore_local_proxy,
+            client_config=client_config,
         )
 
         try:

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

@@ -307,6 +307,19 @@ def test_register_extra_headers(mock_request, remote_connection):
     assert headers["Foo"] == "bar"
 
 
+def test_backwards_compatibility_with_appium_connection():
+    # Keep backward compatibility for AppiumConnection - https://github.com/SeleniumHQ/selenium/issues/14694
+    client_config = ClientConfig(remote_server_addr="http://remote", ca_certs="/path/to/cacert.pem", timeout=300)
+    remote_connection = RemoteConnection(client_config=client_config)
+    assert remote_connection._ca_certs == "/path/to/cacert.pem"
+    assert remote_connection._timeout == 300
+    assert remote_connection._client_config == client_config
+    remote_connection.set_timeout(120)
+    assert remote_connection.get_timeout() == 120
+    remote_connection.set_certificate_bundle_path("/path/to/cacert2.pem")
+    assert remote_connection.get_certificate_bundle_path() == "/path/to/cacert2.pem"
+
+
 def test_get_connection_manager_with_timeout_from_client_config():
     remote_connection = RemoteConnection(remote_server_addr="http://remote", keep_alive=False)
     remote_connection.set_timeout(10)