Skip to content

Commit

Permalink
Merge branch 'trunk' into webkit_service
Browse files Browse the repository at this point in the history
  • Loading branch information
Delta456 authored Oct 18, 2024
2 parents cfd881a + 7c9f000 commit f0f9ea5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
6 changes: 3 additions & 3 deletions py/selenium/webdriver/remote/remote_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,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):
def _request(self, method, url, body=None, timeout=120):
"""Send an HTTP request to the remote server.
:Args:
Expand All @@ -323,12 +323,12 @@ def _request(self, method, url, body=None):
body = None

if self.keep_alive:
response = self._conn.request(method, url, body=body, headers=headers)
response = self._conn.request(method, url, body=body, headers=headers, timeout=timeout)
statuscode = response.status
else:
conn = self._get_connection_manager()
with conn as http:
response = http.request(method, url, body=body, headers=headers)
response = http.request(method, url, body=body, headers=headers, timeout=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)
Expand Down
7 changes: 7 additions & 0 deletions scripts/format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,12 @@ section "Rust"
echo " rustfmt" >&2
bazel run @rules_rust//:rustfmt

# TODO: use bazel target when rules_python supports formatting
section "Python"
echo " python - isort, black, flake8, docformatter" >&2
pip install tox
export TOXENV=linting
tox -c py/tox.ini

section "Copyright"
bazel run //scripts:update_copyright

0 comments on commit f0f9ea5

Please sign in to comment.