Skip to content

Commit 66b87c8

Browse files
box-sdk-buildbox-sdk-build
andauthored
fix: set default timeouts for requests (box/box-codegen#707) (#552)
Co-authored-by: box-sdk-build <[email protected]>
1 parent cf28848 commit 66b87c8

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.codegen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "engineHash": "5f0371b", "specHash": "f737b7b", "version": "1.13.0" }
1+
{ "engineHash": "6feab51", "specHash": "f737b7b", "version": "1.13.0" }

box_sdk_gen/networking/box_network_client.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ def _prepare_body(
227227
def _make_request(self, request: APIRequest) -> APIResponse:
228228
raised_exception = None
229229
reauthentication_needed = False
230+
default_timeout = (5, 60) # connect, read timeout
230231
try:
231232
network_response = self.requests_session.request(
232233
method=request.method,
@@ -236,6 +237,7 @@ def _make_request(self, request: APIRequest) -> APIResponse:
236237
params=request.params,
237238
allow_redirects=request.allow_redirects,
238239
stream=True,
240+
timeout=default_timeout,
239241
)
240242
except RequestException as request_exc:
241243
raised_exception = request_exc

test/box_network_client.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,9 @@ def test_make_request(network_client, mock_requests_session, response_200):
378378
raised_exception=None,
379379
)
380380
assert mock_requests_session.request.call_count == 1
381-
mock_requests_session.request.assert_called_once_with(**request_params, stream=True)
381+
mock_requests_session.request.assert_called_once_with(
382+
**request_params, stream=True, timeout=(5, 60)
383+
)
382384

383385

384386
def test_make_request_unauthorised(network_client, mock_requests_session, response_401):
@@ -698,6 +700,7 @@ def test_retrying_401_response_with_new_token_and_auth_provided(
698700
data=None,
699701
stream=True,
700702
allow_redirects=True,
703+
timeout=(5, 60),
701704
),
702705
mock.call(
703706
method="GET",
@@ -712,6 +715,7 @@ def test_retrying_401_response_with_new_token_and_auth_provided(
712715
data=None,
713716
stream=True,
714717
allow_redirects=True,
718+
timeout=(5, 60),
715719
),
716720
],
717721
)
@@ -751,6 +755,7 @@ def test_not_retrying_401_when_auth_not_provided(
751755
data=None,
752756
stream=True,
753757
allow_redirects=True,
758+
timeout=(5, 60),
754759
)
755760

756761

@@ -1212,4 +1217,5 @@ def test_disable_follow_redirects(
12121217
data=None,
12131218
stream=True,
12141219
allow_redirects=False,
1220+
timeout=(5, 60),
12151221
)

0 commit comments

Comments
 (0)