Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions tests/unit/http/test_async_http_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,22 @@ async def test_invalid_request_timeout_raises_exception(self):
with self.assertRaises(ValueError):
await self.client.request("doesnt matter", "doesnt matter", timeout=-1)

async def test_request_uses_client_timeout_when_none_passed(self):
self.client.timeout = 30
await self.client.request("GET", "https://mock.twilio.com")

self.session_mock.request.assert_called()
request_args = self.session_mock.request.call_args.kwargs
self.assertEqual(request_args["timeout"], 30)

async def test_request_timeout_overrides_client_timeout(self):
self.client.timeout = 30
await self.client.request("GET", "https://mock.twilio.com", timeout=15)

self.session_mock.request.assert_called()
request_args = self.session_mock.request.call_args.kwargs
self.assertEqual(request_args["timeout"], 15)


class TestAsyncHttpClientRetries(aiounittest.AsyncTestCase):
def setUp(self):
Expand Down
4 changes: 3 additions & 1 deletion twilio/http/async_http_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ async def request(
:return: An http response
"""
if timeout is not None and timeout <= 0:
if timeout is None:
timeout = self.timeout
elif timeout <= 0:
raise ValueError(timeout)

basic_auth = None
Expand Down