fix:xread bug (#257)

Fix #256
cunla · Dec 5, 2023 · 9ba929e · 9ba929e
1 parent b629adb
commit 9ba929e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/fakeredis/commands_mixins/streams_mixin.py b/fakeredis/commands_mixins/streams_mixin.py
@@ -106,7 +106,7 @@ def _xread(self, stream_start_id_list: List, count: int, first_pass: bool):
         res = list()
         for item, start_id in stream_start_id_list:
             stream_results = self._xrange(item.value, start_id, max_inf, False, count)
-            if first_pass and (count is None or len(stream_results) < count):
+            if first_pass and (count is None):
                 return None
             if len(stream_results) > 0:
                 res.append([item.key, stream_results])
@@ -137,22 +137,8 @@ def _parse_start_id(key: CommandItem, s: bytes) -> StreamRangeTest:
 
     @command(name="XREAD", fixed=(bytes,), repeat=(bytes,))
     def xread(self, *args):
-        (
-            count,
-            timeout,
-        ), left_args = extract_args(
-            args,
-            (
-                "+count",
-                "+block",
-            ),
-            error_on_unexpected=False,
-        )
-        if (
-                len(left_args) < 3
-                or not casematch(left_args[0], b"STREAMS")
-                or len(left_args) % 2 != 1
-        ):
+        (count, timeout,), left_args = extract_args(args, ("+count", "+block",), error_on_unexpected=False, )
+        if (len(left_args) < 3 or not casematch(left_args[0], b"STREAMS") or len(left_args) % 2 != 1):
             raise SimpleError(msgs.SYNTAX_ERROR_MSG)
         left_args = left_args[1:]
         num_streams = int(len(left_args) / 2)

diff --git a/test/test_mixins/test_streams_commands.py b/test/test_mixins/test_streams_commands.py
@@ -256,6 +256,13 @@ def test_xread(r: redis.Redis):
     assert r.xread(streams={stream: m2}) == []
 
 
+def test_xread_count(r: redis.Redis):
+    r.xadd("test", {"x": 1})
+    result = r.xread(streams={"test": "0"}, count=100, block=10)
+    assert result[0][0] == b"test"
+    assert result[0][1][0][1] == {b'x': b'1'}
+
+
 def test_xread_bad_commands(r: redis.Redis):
     with pytest.raises(redis.ResponseError) as exc_info:
         testtools.raw_command(r, 'xread', 'foo', '11-1')