Skip to content

Commit e9ec0be

Browse files
authored
[py] Remote connection use timeout from ClientConfig (#14692)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 961db5e commit e9ec0be

File tree

6 files changed

+14
-8
lines changed

6 files changed

+14
-8
lines changed

py/selenium/webdriver/chromium/remote_connection.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ def __init__(
3030
ignore_proxy: Optional[bool] = False,
3131
client_config: Optional[ClientConfig] = None,
3232
) -> None:
33-
client_config = client_config or ClientConfig(remote_server_addr=remote_server_addr, keep_alive=keep_alive)
33+
client_config = client_config or ClientConfig(
34+
remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
35+
)
3436
super().__init__(
3537
ignore_proxy=ignore_proxy,
3638
client_config=client_config,

py/selenium/webdriver/firefox/remote_connection.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ def __init__(
3232
ignore_proxy: Optional[bool] = False,
3333
client_config: Optional[ClientConfig] = None,
3434
) -> None:
35-
client_config = client_config or ClientConfig(remote_server_addr=remote_server_addr, keep_alive=keep_alive)
35+
client_config = client_config or ClientConfig(
36+
remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
37+
)
3638
super().__init__(
3739
ignore_proxy=ignore_proxy,
3840
client_config=client_config,

py/selenium/webdriver/ie/webdriver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(
5050
self.service.path = self.service.env_path() or DriverFinder(self.service, options).get_driver_path()
5151
self.service.start()
5252

53-
client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive)
53+
client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
5454
executor = RemoteConnection(
5555
ignore_proxy=options._ignore_local_proxy,
5656
client_config=client_config,

py/selenium/webdriver/remote/remote_connection.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def execute(self, command, params):
375375
LOGGER.debug("%s %s %s", command_info[0], url, str(trimmed))
376376
return self._request(command_info[0], url, body=data)
377377

378-
def _request(self, method, url, body=None, timeout=120):
378+
def _request(self, method, url, body=None):
379379
"""Send an HTTP request to the remote server.
380380
381381
:Args:
@@ -397,12 +397,12 @@ def _request(self, method, url, body=None, timeout=120):
397397
body = None
398398

399399
if self._client_config.keep_alive:
400-
response = self._conn.request(method, url, body=body, headers=headers, timeout=timeout)
400+
response = self._conn.request(method, url, body=body, headers=headers, timeout=self._client_config.timeout)
401401
statuscode = response.status
402402
else:
403403
conn = self._get_connection_manager()
404404
with conn as http:
405-
response = http.request(method, url, body=body, headers=headers, timeout=timeout)
405+
response = http.request(method, url, body=body, headers=headers, timeout=self._client_config.timeout)
406406
statuscode = response.status
407407
data = response.data.decode("UTF-8")
408408
LOGGER.debug("Remote response: status=%s | data=%s | headers=%s", response.status, data, response.headers)

py/selenium/webdriver/safari/remote_connection.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ def __init__(
3232
ignore_proxy: Optional[bool] = False,
3333
client_config: Optional[ClientConfig] = None,
3434
) -> None:
35-
client_config = client_config or ClientConfig(remote_server_addr=remote_server_addr, keep_alive=keep_alive)
35+
client_config = client_config or ClientConfig(
36+
remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
37+
)
3638
super().__init__(
3739
ignore_proxy=ignore_proxy,
3840
client_config=client_config,

py/selenium/webdriver/safari/webdriver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def __init__(
5151
if not self.service.reuse_service:
5252
self.service.start()
5353

54-
client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive)
54+
client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
5555
executor = SafariRemoteConnection(
5656
ignore_proxy=options._ignore_local_proxy,
5757
client_config=client_config,

0 commit comments

Comments
 (0)