add cleanup tests for pipeline

Author: agnesnatasya

redis/client.py

@@ -582,7 +582,6 @@ def execute_command(self, *args, **options):
             if not self.connection:
                 pool.release(conn)
             if "SCAN" in command_name.upper():
-                breakpoint()
                 pool.cleanup(iter_req_id=options.get("_iter_req_id", None))
 
     def parse_response(self, connection, command_name, **options):
@@ -764,6 +763,7 @@ def reset(self) -> None:
         self.patterns = {}
         self.pending_unsubscribe_patterns = set()
         self.subscribed_event.clear()
+        self.connection_pool.cleanup(iter_req_id=options.get("_iter_req_id", None))
 
     def close(self) -> None:
         self.reset()

tests/test_sentinel_managed_connection.py

@@ -207,7 +207,22 @@ def test_connects_to_same_address_if_no_iter_req_id_master(
     )
 
 
-def test_scan_iter_family_cleans_up(
+def test_scan_iter_in_redis_cleans_up(
+    connection_pool_replica_mock: SentinelConnectionPool,
+):
+    """Test that connection pool is correctly cleaned up"""
+    from redis import Redis
+
+    r = Redis(connection_pool=connection_pool_replica_mock)
+    # Patch the actual sending and parsing response from the Connection object
+    # but still let the connection pool does all the necessary work
+    with mock.patch.object(r, "_send_command_parse_response", return_value=(0, [])):
+        [k for k in r.scan_iter("a")]
+    # Test that the iter_req_id for the scan command is cleared at the
+    # end of the SCAN ITER command
+    assert not connection_pool_replica_mock._iter_req_id_to_replica_address
+
+def test_scan_iter_in_pipeline_cleans_up(
     connection_pool_replica_mock: SentinelConnectionPool,
 ):
     """Test that connection pool is correctly cleaned up"""
@@ -216,7 +231,14 @@ def test_scan_iter_family_cleans_up(
     from redis.commands.core import ScanCommands
 
     r = Redis(connection_pool=connection_pool_replica_mock)
+    r.pipeline()
+    r.scan_iter("a")
+    # Patch the actual sending and parsing response from the Connection object
+    # but still let the connection pool does all the necessary work
     with mock.patch.object(r, "_send_command_parse_response", return_value=(0, [])):
+        r.execute()
         [k for k in r.scan_iter("a")]
+    # Test that the iter_req_id for the scan command is cleared at the
+    # end of the SCAN ITER command
     assert not connection_pool_replica_mock._iter_req_id_to_replica_address