Fixed incorrect on error callback

Author: vladvildanov

redis/asyncio/client.py

@@ -644,7 +644,7 @@ async def execute_command(self, *args, **options):
             await self._single_conn_lock.acquire()
         try:
             await conn.retry.call_with_retry(
-                lambda: conn.send_command(*args, **options),
+                lambda: conn.send_command(*args),
                 lambda error: self._disconnect_raise(conn, error),
             )
             return await conn.retry.call_with_retry(
@@ -1374,12 +1374,12 @@ async def immediate_execute_command(self, *args, **options):
             self.connection = conn
 
         await conn.retry.call_with_retry(
-            lambda: conn.send_command(*args, **options),
-            lambda error: self._disconnect_raise(conn, error),
+            lambda: conn.send_command(*args),
+            lambda error: self._disconnect_reset_raise(conn, error),
         )
         return await conn.retry.call_with_retry(
             lambda: self.parse_response(conn, command_name, **options),
-            lambda error: self._disconnect_raise(conn, error),
+            lambda error: self._disconnect_reset_raise(conn, error),
         )
 
     def pipeline_execute_command(self, *args, **options):

redis/client.py

@@ -1405,11 +1405,11 @@ def immediate_execute_command(self, *args, **options):
 
         conn.retry.call_with_retry(
             lambda: conn.send_command(*args, **options),
-            lambda error: self._disconnect_raise(conn, error),
+            lambda error: self._disconnect_reset_raise(conn, error),
         )
         return conn.retry.call_with_retry(
             lambda: self.parse_response(conn, command_name, **options),
-            lambda error: self._disconnect_raise(conn, error),
+            lambda error: self._disconnect_reset_raise(conn, error),
         )
 
     def pipeline_execute_command(self, *args, **options) -> "Pipeline":

tests/test_asyncio/conftest.py

@@ -1,7 +1,7 @@
 import random
 from contextlib import asynccontextmanager as _asynccontextmanager
 from typing import Union
-from unittest.mock import Mock
+from unittest.mock import Mock, AsyncMock
 
 import pytest
 import pytest_asyncio
@@ -222,13 +222,13 @@ async def mock_cluster_resp_slaves(create_redis, **kwargs):
 
 @pytest_asyncio.fixture()
 def mock_connection() -> Connection:
-    mock_connection = Mock(spec=Connection)
+    mock_connection = AsyncMock(spec=Connection)
     return mock_connection
 
 
 @pytest_asyncio.fixture()
 def mock_pool() -> ConnectionPool:
-    mock_pool = Mock(spec=ConnectionPool)
+    mock_pool = AsyncMock(spec=ConnectionPool)
     return mock_pool
 
 

tests/test_asyncio/test_connection.py

@@ -91,7 +91,7 @@ async def get_conn():
             await asyncio.gather(r.set("a", "b"), r.set("c", "d"))
 
     assert init_call_count == 1
-    assert command_call_count == 2
+    assert command_call_count == 4
     r.connection = None  # it was a Mock
     await r.aclose()