Skip to content

[16.0][IMP] webservice: do not override timeout #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OCA-git-bot merged 1 commit into from
Oct 29, 2026
Merged

[16.0][IMP] webservice: do not override timeout #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions webservice/components/request_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def _request(self, method, url=None, url_params=None, **kwargs):
{
"auth": self._get_auth(**kwargs),
"headers": self._get_headers(**kwargs),
"timeout": None,
}
)
# pylint: disable=E8106
Expand Down Expand Up @@ -180,7 +179,6 @@ def _request(self, method, url=None, url_params=None, **kwargs):
new_kwargs.update(
{
"headers": self._get_headers(**kwargs),
"timeout": None,
}
)
client = BackendApplicationClient(client_id=self.collection.oauth2_clientid)
Expand Down
3 changes: 2 additions & 1 deletion webservice/tests/test_oauth2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ def test_fetch_token(self):
responses.add(responses.GET, f"{self.url}endpoint", body="OK")

with mock_cursor(self.env.cr):
result = self.webservice.call("get", url=f"{self.url}endpoint")
result = self.webservice.call("get", url=f"{self.url}endpoint", timeout=10)
self.webservice.invalidate_recordset()
self.assertTrue("cool_token" in self.webservice.oauth2_token)
self.assertEqual(result, b"OK")
self.assertEqual(responses.calls[-1].request.req_kwargs["timeout"], 10)

@responses.activate
def test_update_token(self):
Expand Down
3 changes: 2 additions & 1 deletion webservice/tests/test_webservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,15 @@ def test_web_service_call_args(self):
url = "https://custom.url"
responses.add(responses.POST, url, body="{}")
result = self.webservice.call(
"post", url=url, headers={"demo_header": "HEADER"}
"post", url=url, headers={"demo_header": "HEADER"}, timeout=10
)
self.assertEqual(result, b"{}")
self.assertEqual(len(responses.calls), 1)
self.assertEqual(
responses.calls[0].request.headers["Content-Type"], "application/xml"
)
self.assertEqual(responses.calls[0].request.headers["demo_header"], "HEADER")
self.assertEqual(responses.calls[0].request.req_kwargs["timeout"], 10)

url = self.url + "custom/path"
self.webservice.url += "{endpoint}"
Expand Down
Loading