treat connection error like a timeout

Author: adorton-adobe

tests/test_connections.py

@@ -59,6 +59,31 @@ def test_remote_status_timeout():
         assert remote_status["status"].startswith("Unreachable")
 
 
+def test_remote_status_error():
+    with mock.patch("umapi_client.connection.requests.Session.get") as mock_get:
+        mock_get.side_effect = requests.ConnectionError
+        conn = Connection(**mock_connection_params)
+        _, remote_status = conn.status(remote=True)
+        assert remote_status["status"].startswith("Unreachable")
+
+
+# log_stream fixture defined in conftest.py
+def test_remote_status_error_logging(log_stream):
+    with mock.patch("umapi_client.connection.requests.Session.get") as mock_get:
+        mock_get.side_effect = requests.ConnectionError
+        stream, logger = log_stream
+        params = dict(mock_connection_params)
+        params["logger"] = logger
+        conn = Connection(**params)
+        pytest.raises(UnavailableError, conn.make_call, "")
+        stream.flush()
+        log = stream.getvalue()  # save as a local so can do pytest -l to see exact log
+        assert "code Error on try 1" in log
+        assert "code Error on try 2" in log
+        assert "code Error on try 3" in log
+        assert "code Error on try 4" not in log
+
+
 def test_ua_string():
     conn = Connection(**mock_connection_params)
     req = conn.session.prepare_request(requests.Request('GET', "http://test.com/"))

umapi_client/connection.py

@@ -44,6 +44,7 @@ def __init__(self, result=None, success=False, timeout=None):
         self.result = result
         self.success = success
         self.timeout = timeout
+        self.status_code = result.status_code if hasattr(result, 'status_code') else 'Error'
 
     def check_result(self):
         if self.result.status_code in self.success_codes:
@@ -53,7 +54,6 @@ def check_result(self):
             self.success = False
             self.timeout = self.get_timeout()
             return self
-        print("STATUS", self.result.status_code)
         if self.client_error(self.result.status_code):
             raise ClientError("Unexpected HTTP Status {:d}: {}".format(self.result.status_code, self.result.text), self.result)
         if self.request_error(self.result.status_code):
@@ -485,12 +485,16 @@ def call():
                 if self.logger: self.logger.warning("UMAPI connection timeout...(%d seconds on try %d)",
                                                     self.timeout, num_attempts)
                 checked_result = APIResult(success=False, timeout=0)
+            except requests.ConnectionError:
+                if self.logger: self.logger.warning("UMAPI connection error...(%d seconds on try %d)",
+                                                    self.timeout, num_attempts)
+                checked_result = APIResult(success=False, timeout=0)
 
             if checked_result.success:
                 return result
 
-            if self.logger: self.logger.warning("UMAPI timeout...service unavailable (code %d on try %d)",
-                                                result.status_code, num_attempts)
+            if self.logger: self.logger.warning("UMAPI timeout...service unavailable (code %s on try %d)",
+                                                checked_result.status_code, num_attempts)
 
             retry_wait = checked_result.timeout
             if retry_wait <= 0:
@@ -507,4 +511,4 @@ def call():
         total_time = int(time() - start_time)
         if self.logger: self.logger.error("UMAPI timeout...giving up after %d attempts (%d seconds).",
                                           self.retry_max_attempts, total_time)
-        raise UnavailableError(self.retry_max_attempts, total_time, result)
+        raise UnavailableError(self.retry_max_attempts, total_time, checked_result.result)