From 521f783020e3219bd698bbbe84397426c56e2dce Mon Sep 17 00:00:00 2001 From: Bob Strecansky Date: Sun, 6 Aug 2017 23:02:07 -0400 Subject: [PATCH] [#4535] - Unwrap max retries exceeded errors --- acme/acme/client.py | 2 +- acme/acme/client_test.py | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/acme/acme/client.py b/acme/acme/client.py index 2e07d34d7..6fcee2fdc 100644 --- a/acme/acme/client.py +++ b/acme/acme/client.py @@ -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)) diff --git a/acme/acme/client_test.py b/acme/acme/client_test.py index 172e94d74..ff0ac18ef 100644 --- a/acme/acme/client_test.py +++ b/acme/acme/client_test.py @@ -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."""