upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[#4535] - Unwrap max retries exceeded errors

Browse source
This commit is contained in:
Bob Strecansky 2017-08-06 23:02:07 -04:00
parent 5fb1568b6e
commit 521f783020
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acme/acme/client.py
View file

@ -647,7 +647,7 @@ class ClientNetwork(object): # pylint: disable=too-many-instance-attributes
err_regex = r".*host='(\S*)'.*Max retries exceeded with url\: (\/\w*).*(\[Errno \d+\])([A-Za-z ]*)"
m = re.match(err_regex, str(e))
if m is None:
raise # pragma: no cover
raise #pragma: no cover
else:
host, path, _err_no, err_msg = m.groups()
raise ValueError("Requesting {0}{1}:{2}".format(host, path, err_msg))

18
acme/acme/client_test.py
View file

@ -7,7 +7,6 @@ from six.moves import http_client # pylint: disable=import-error
import mock
import requests
import sys
from acme import challenges
from acme import errors
@ -630,21 +629,8 @@ class ClientNetworkTest(unittest.TestCase):
# Python Exceptions
except ValueError as y:
if "linux" in sys.platform:
self.assertEqual("Requesting localhost/nonexistent: "
"Connection refused", str(y))
else: #pragma: no cover
self.assertEqual("Requesting localhost/nonexistent: "
"Connection refused", str(y))
# Requests Exceptions
except requests.exceptions.ConnectionError as z: #pragma: no cover
if "linux" in sys.platform:
self.assertEqual("('Connection aborted.', "
"error(111, 'Connection refused'))", str(z))
else: #pragma: no cover
self.assertEqual("('Connection aborted.', "
"error('Connection refused'))", str(z))
self.assertEqual("Requesting localhost/nonexistent: "
"Connection refused", str(y))
class ClientNetworkWithMockedResponseTest(unittest.TestCase):
"""Tests for acme.client.ClientNetwork which mock out response."""