diff options
author | Bob Strecansky <bob.strecansky@gmail.com> | 2017-08-05 17:16:47 +0300 |
---|---|---|
committer | Bob Strecansky <bob.strecansky@gmail.com> | 2017-08-05 17:16:47 +0300 |
commit | 959d72feb035dd49efc32f8f39f92e79ea32b2c3 (patch) | |
tree | 105632ef8d41c702ee105a9a5dfce0734c708fc5 | |
parent | 1e71ff537733d701688117fce0b92d3393018934 (diff) |
[#4535] - Unwrap max retries exceeded errors
-rw-r--r-- | acme/acme/client.py | 2 | ||||
-rw-r--r-- | acme/acme/client_test.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/acme/acme/client.py b/acme/acme/client.py index 67a4079fd..7316066da 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -651,7 +651,7 @@ class ClientNetwork(object): # pylint: disable=too-many-instance-attributes raise # pragma: no cover else: host, path, err_no, err_msg = m.groups() - raise ValueError("Requesting {0}{1}: {2}{3}".format(host, path, err_no, err_msg)) + raise ValueError("Requesting {0}{1}: {2}".format(host, path, err_msg)) # If content is DER, log the base64 of it instead of raw bytes, to keep # binary data out of the logs. diff --git a/acme/acme/client_test.py b/acme/acme/client_test.py index c800f476c..1c6b4a77c 100644 --- a/acme/acme/client_test.py +++ b/acme/acme/client_test.py @@ -632,19 +632,19 @@ class ClientNetworkTest(unittest.TestCase): except ValueError as y: if "linux" in sys.platform: self.assertEqual("Requesting localhost/nonexistent: " - "[Errno 111] Connection refused", str(y)) + "Connection refused", str(y)) else: #pragma: no cover self.assertEqual("Requesting localhost/nonexistent: " - "[Errno 61] Connection refused", str(y)) + "Connection refused", str(y)) # Python 3 except requests.exceptions.ConnectionError as z: #pragma: no cover if "linux" in sys.platform: self.assertEqual("('Connection aborted.', " - "error(111, 'Connection refused'))", str(z)) + "error('Connection refused'))", str(z)) else: #pragma: no cover self.assertEqual("('Connection aborted.', " - "error(61, 'Connection refused'))", str(z)) + "error('Connection refused'))", str(z)) class ClientNetworkWithMockedResponseTest(unittest.TestCase): """Tests for acme.client.ClientNetwork which mock out response.""" |