Skip to content

[Core] Handle requests connection timeout error #7542

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
annatisch merged 5 commits into from
Oct 3, 2019
Merged

[Core] Handle requests connection timeout error #7542

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85ae880
Handle requests connection timeout error
annatisch Oct 1, 2019
66039d8
Moved catch
annatisch Oct 1, 2019
f423cf1
Added test
annatisch Oct 1, 2019
67354e0
Merge remote-tracking branch 'origin/master' into annatisch-patch-5
annatisch Oct 2, 2019
0f57ff5
Update test to be more stable
annatisch Oct 2, 2019
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: 1 addition & 1 deletion sdk/core/azure-core/azure/core/pipeline/transport/requests_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def send(self, request, **kwargs): # type: ignore
allow_redirects=False,
**kwargs)

except urllib3.exceptions.NewConnectionError as err:
except (urllib3.exceptions.NewConnectionError, urllib3.exceptions.ConnectTimeoutError) as err:
error = ServiceRequestError(err, error=err)
except requests.exceptions.ReadTimeout as err:
error = ServiceResponseError(err, error=err)
Expand Down
13 changes: 12 additions & 1 deletion sdk/core/azure-core/tests/test_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
RequestsTransport
)

from azure.core.configuration import Configuration
from azure.core.exceptions import ServiceRequestError


def test_sans_io_exception():
Expand Down Expand Up @@ -107,6 +107,17 @@ def test_basic_requests(self):
assert pipeline._transport.session is None
assert response.http_response.status_code == 200

def test_requests_socket_timeout(self):
conf = Configuration()
request = HttpRequest("GET", "https://bing.com")
policies = [
UserAgentPolicy("myusergant"),
RedirectPolicy()
]
with pytest.raises(ServiceRequestError):
with Pipeline(RequestsTransport(), policies=policies) as pipeline:
response = pipeline.run(request, connection_timeout=0.000001)

def test_basic_requests_separate_session(self):

session = requests.Session()
Expand Down