add tests for all scan iter family

Author: agnesnatasya

redis/commands/core.py

@@ -3070,7 +3070,7 @@ def sscan(
             pieces.extend([b"MATCH", match])
         if count is not None:
             pieces.extend([b"COUNT", count])
-        return self.execute_command("SSCAN", *pieces,)
+        return self.execute_command("SSCAN", *pieces, **kwargs)
 
     def sscan_iter(
         self,
@@ -3295,11 +3295,7 @@ async def hscan_iter(
         cursor = "0"
         while cursor != 0:
             cursor, data = await self.hscan(
-<<<<<<< HEAD
-                name, cursor=cursor, match=match, count=count, no_values=no_values
-=======
-                name, cursor=cursor, match=match, count=count, _iter_req_id=iter_req_id
->>>>>>> 39aaec6 (fix scan iter command issued to different replicas)
+                name, cursor=cursor, match=match, count=count, no_values=no_values, _iter_req_id=iter_req_id
             )
             if no_values:
                 for it in data:

tests/test_asyncio/test_sentinel_managed_connection.py

@@ -1,10 +1,12 @@
 import socket
 from typing import Tuple
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, ANY
 
 import pytest
 import pytest_asyncio
+import uuid
 from redis.asyncio.retry import Retry
+from redis.commands.core import AsyncScanCommands
 from redis.asyncio.sentinel import (
     Sentinel,
     SentinelConnectionPool,
@@ -244,3 +246,25 @@ async def test_connects_to_same_address_if_no_iter_req_id_master(
         await connection_pool_master_mock.get_connection("ANY_COMMAND"),
         connection_for_req_1,
     )
+
+
+async def test_scan_iter_family_executes_commands_with_same_iter_req_id():
+    """Assert that all calls to execute_command receives the _iter_req_id kwarg"""
+    with mock.patch.object(
+        AsyncScanCommands,
+        "execute_command", 
+        AsyncMock(return_value=(0, []))
+    ) as mock_execute_command, mock.patch.object(uuid, "uuid4", return_value="uuid"):
+        [a async for a in AsyncScanCommands().scan_iter()]
+        mock_execute_command.assert_called_with('SCAN', '0', _iter_req_id="uuid")
+        [a async for a in AsyncScanCommands().sscan_iter("")]
+        mock_execute_command.assert_called_with('SSCAN', '', '0', _iter_req_id="uuid")
+    with mock.patch.object(
+        AsyncScanCommands,
+        "execute_command", 
+        AsyncMock(return_value=(0, {}))
+    ) as mock_execute_command, mock.patch.object(uuid, "uuid4", return_value="uuid"):
+        [a async for a in AsyncScanCommands().hscan_iter("")]
+        mock_execute_command.assert_called_with('HSCAN', '', '0', no_values=None, _iter_req_id="uuid")
+        [a async for a in AsyncScanCommands().zscan_iter("")]
+        mock_execute_command.assert_called_with('ZSCAN', '', '0', score_cast_func=ANY, _iter_req_id="uuid")