[py] Remote connection use timeout from ClientConfig (#14692)

Signed-off-by: Viet Nguyen Duc <[email protected]>
SeleniumHQ · Oct 31, 2024 · e9ec0be · e9ec0be
1 parent 961db5e
commit e9ec0be
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/py/selenium/webdriver/chromium/remote_connection.py b/py/selenium/webdriver/chromium/remote_connection.py
@@ -30,7 +30,9 @@ 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)
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
             ignore_proxy=ignore_proxy,
             client_config=client_config,

diff --git a/py/selenium/webdriver/firefox/remote_connection.py b/py/selenium/webdriver/firefox/remote_connection.py
@@ -32,7 +32,9 @@ 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)
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
             ignore_proxy=ignore_proxy,
             client_config=client_config,

diff --git a/py/selenium/webdriver/ie/webdriver.py b/py/selenium/webdriver/ie/webdriver.py
@@ -50,7 +50,7 @@ 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)
+        client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
         executor = RemoteConnection(
             ignore_proxy=options._ignore_local_proxy,
             client_config=client_config,

diff --git a/py/selenium/webdriver/remote/remote_connection.py b/py/selenium/webdriver/remote/remote_connection.py
@@ -375,7 +375,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 +397,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)

diff --git a/py/selenium/webdriver/safari/remote_connection.py b/py/selenium/webdriver/safari/remote_connection.py
@@ -32,7 +32,9 @@ 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)
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
             ignore_proxy=ignore_proxy,
             client_config=client_config,

diff --git a/py/selenium/webdriver/safari/webdriver.py b/py/selenium/webdriver/safari/webdriver.py
@@ -51,7 +51,7 @@ 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)
+        client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
         executor = SafariRemoteConnection(
             ignore_proxy=options._ignore_local_proxy,
             client_config=client_config,