Keep last exception cause in errors list

Author: pquentin

elastic_transport/_async_transport.py

@@ -323,6 +323,8 @@ async def perform_request(  # type: ignore[override, return]
                             # exception not to interrupt the retries.
                             pass
 
+                errors.append(e)
+
                 if not retry or attempt >= max_retries:
                     # Since we're exhausted but we have previously
                     # received some sort of response from the API
@@ -340,7 +342,6 @@ async def perform_request(  # type: ignore[override, return]
                         max_retries,
                         exc_info=e,
                     )
-                    errors.append(e)
 
             else:
                 # If we got back a response we need to check if that status

elastic_transport/_transport.py

@@ -401,6 +401,8 @@ def perform_request(  # type: ignore[return]
                             # exception not to interrupt the retries.
                             pass
 
+                errors.append(e)
+
                 if not retry or attempt >= max_retries:
                     # Since we're exhausted but we have previously
                     # received some sort of response from the API
@@ -418,7 +420,6 @@ def perform_request(  # type: ignore[return]
                         max_retries,
                         exc_info=e,
                     )
-                    errors.append(e)
 
             else:
                 # If we got back a response we need to check if that status

tests/async_/test_async_transport.py

@@ -139,12 +139,41 @@ async def test_request_will_fail_after_x_retries():
             )
         ],
         node_class=AsyncDummyNode,
+        max_retries=0,
+    )
+
+    with pytest.raises(ConnectionError) as e:
+        await t.perform_request("GET", "/")
+
+    assert 1 == len(t.node_pool.get().calls)
+    assert len(e.value.errors) == 1
+
+    # max_retries=3
+    t = AsyncTransport(
+        [
+            NodeConfig(
+                "http",
+                "localhost",
+                80,
+                _extras={"exception": ConnectionError("abandon ship")},
+            )
+        ],
+        node_class=AsyncDummyNode,
+        max_retries=3,
     )
 
     with pytest.raises(ConnectionError) as e:
         await t.perform_request("GET", "/")
 
     assert 4 == len(t.node_pool.get().calls)
+    assert len(e.value.errors) == 4
+    assert all(isinstance(error, ConnectionError) for error in e.value.errors)
+
+    # max_retries=2 in perform_request()
+    with pytest.raises(ConnectionError) as e:
+        await t.perform_request("GET", "/", max_retries=2)
+
+    assert 7 == len(t.node_pool.get().calls)
     assert len(e.value.errors) == 3
     assert all(isinstance(error, ConnectionError) for error in e.value.errors)
 

tests/test_transport.py

@@ -139,7 +139,7 @@ def test_request_will_fail_after_x_retries():
         t.perform_request("GET", "/")
 
     assert 1 == len(t.node_pool.get().calls)
-    assert len(e.value.errors) == 0
+    assert len(e.value.errors) == 1
 
     # max_retries=3
     t = Transport(
@@ -159,15 +159,15 @@ def test_request_will_fail_after_x_retries():
         t.perform_request("GET", "/")
 
     assert 4 == len(t.node_pool.get().calls)
-    assert len(e.value.errors) == 3
+    assert len(e.value.errors) == 4
     assert all(isinstance(error, ConnectionError) for error in e.value.errors)
 
     # max_retries=2 in perform_request()
     with pytest.raises(ConnectionError) as e:
         t.perform_request("GET", "/", max_retries=2)
 
     assert 7 == len(t.node_pool.get().calls)
-    assert len(e.value.errors) == 2
+    assert len(e.value.errors) == 3
     assert all(isinstance(error, ConnectionError) for error in e.value.errors)