fix(client): improve timeout logging

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

hpecp/client.py

@@ -28,6 +28,11 @@
 
 import requests
 from six import raise_from
+from urllib3.exceptions import (
+    NewConnectionError,
+    ConnectTimeoutError,
+    MaxRetryError,
+)
 
 from .catalog import CatalogController
 from .config import ConfigController
@@ -477,20 +482,26 @@ def create_session(self):
         response = None
         try:
             self.log.debug("REQ: {} : {} {}".format("Login", "post", url))
-            response = requests.post(url, json=auth, verify=self.verify_ssl)
+            response = requests.post(
+                url, json=auth, verify=self.verify_ssl, timeout=10
+            )
             response.raise_for_status()
 
-        except requests.exceptions.ConnectionError as e:
+        except (
+            requests.exceptions.ConnectionError,
+            NewConnectionError,
+            MaxRetryError,
+            ConnectTimeoutError,
+        ) as e:
             self.log.debug(
                 "RES: {} : {} {} {}".format("Login", "post", url, str(e))
             )
             if self.log.level == 10:  # "DEBUG"
-                msg = "Could not connect to controller."
+                # The error is already output to the log, so this message
+                # can be brief.
+                msg = "Could not connect to the controller."
             else:
-                msg = (
-                    "Could not connect to controller - set LOG_LEVEL=DEBUG to "
-                    "see more detail."
-                )
+                msg = "Could not connect to the controller.\n" + str(e)
             raise_from(
                 APIException(
                     message=msg, request_method="post", request_url=url,

tests/library/cli_test.py

@@ -337,13 +337,15 @@ def test_get_failed_login(self, mock_get, mock_post):
 
         self.assertEqual(cm.exception.code, 1)
 
-        self.assertEqual(self.out.getvalue(), "")
+        self.assertEqual(self.out.getvalue().strip(), "")
+
+        actual_err = self.err.getvalue().strip()
+        expected_err = "Could not connect to the controller."
 
         # coverage seems to populate standard error (issues 93)
         self.assertTrue(
-            self.err.getvalue().endswith(
-                "Could not connect to controller - set LOG_LEVEL=DEBUG to see more detail.\n"
-            )
+            self.err.getvalue().strip().endswith(expected_err),
+            "Expected: `{}` Actual: `{}`".format(expected_err, actual_err),
         )
 
     @patch("requests.get", side_effect=mocked_requests_get)