fix some tests

Author: agnesnatasya

redis/asyncio/client.py

@@ -651,7 +651,9 @@ async def execute_command(self, *args, **options):
         finally:
             if not self.connection:
                 await pool.release(conn)
-                if "ITER" in command_name.upper():
+                # Do additional cleanup if this is part of a SCAN ITER family command.
+                # It's possible that this is just a pure SCAN family command though.
+                if "SCAN" in command_name.upper():
                     pool.cleanup(iter_req_id=options.get("iter_req_id", None))
 
     async def parse_response(

redis/asyncio/sentinel.py

@@ -253,6 +253,7 @@ async def get_connection(
         should go to the same replica.
         """
         # If not an iter command or in master mode, call superclass' implementation
+        breakpoint()
         if not (iter_req_id := options.get("iter_req_id", None)) or self.is_master:
             return await super().get_connection(command_name, *keys, **options)
 
@@ -292,7 +293,9 @@ async def get_connection(
             # This will connect to the host and port of the replica
             else:
                 await connection.connect_to_address((server_host, server_port))
+            breakpoint()
             await self.ensure_connection_connected_to_address(connection)
+            breakpoint()
         except BaseException:
             # Release the connection back to the pool so that we don't
             # leak it

redis/client.py

@@ -581,8 +581,10 @@ def execute_command(self, *args, **options):
         finally:
             if not self.connection:
                 pool.release(conn)
+            # Do additional cleanup if this is part of a SCAN ITER family command.
+            # It's possible that this is just a pure SCAN family command though.
             if "SCAN" in command_name.upper():
-                pool.cleanup(iter_req_id=options.get("_iter_req_id", None))
+                pool.cleanup(iter_req_id=options.get("iter_req_id", None))
 
     def parse_response(self, connection, command_name, **options):
         """Parses a response from the Redis server"""

redis/sentinel.py

@@ -54,6 +54,7 @@ def _connect_retry(self, same_address: bool = False):
         if self.connection_pool.is_master:
             self.connect_to(self.connection_pool.get_master_address())
         else:
+            breakpoint()
             for slave in self.connection_pool.rotate_slaves():
                 try:
                     return self.connect_to(slave)

tests/test_asyncio/test_sentinel_managed_connection.py

@@ -251,5 +251,6 @@ async def test_scan_iter_family_cleans_up(
 
     r = Redis(connection_pool=connection_pool_replica_mock)
 
-    [k async for k in r.scan_iter("a")]
-    assert not connection_pool_replica_mock.iter_req_id_to_replica_address
+    with mock.patch.object(r, "_send_command_parse_response", return_value=(0, [])):
+        [k async for k in r.scan_iter("a")]
+    assert not connection_pool_replica_mock._iter_req_id_to_replica_address