fix:formatting of error message about missing group

Fix cunla#210
sjjessop · Jul 12, 2023 · e31250c · e31250c
1 parent 6220e20
commit e31250c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/fakeredis/_msgs.py b/fakeredis/_msgs.py
@@ -66,7 +66,7 @@
 XADD_ID_LOWER_THAN_LAST = "ERR The ID specified in XADD is equal or smaller than the target stream top item"
 XADD_INVALID_ID = 'ERR Invalid stream ID specified as stream command argument'
 XGROUP_BUSYGROUP = 'ERR BUSYGROUP Consumer Group name already exists'
-XGROUP_GROUP_NOT_FOUND_MSG = "NOGROUP No such consumer group '%s' for key name '%s'"
+XGROUP_GROUP_NOT_FOUND_MSG = "NOGROUP No such consumer group '{1}' for key name '{0}'"
 XGROUP_KEY_NOT_FOUND_MSG = (
     "ERR The XGROUP subcommand requires the key to exist."
     " Note that for CREATE you may want to use the MKSTREAM option to create an empty stream automatically.")

diff --git a/fakeredis/commands_mixins/streams_mixin.py b/fakeredis/commands_mixins/streams_mixin.py
@@ -140,7 +140,7 @@ def xreadgroup(self, group_const, group_name, consumer_name, *args):
                 raise SimpleError(msgs.XGROUP_KEY_NOT_FOUND_MSG)
             group: StreamGroup = item.value.group_get(group_name)
             if not group:
-                raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(left_args[i], group_name))
+                raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(left_args[i].decode(), group_name.decode()))
             group_params.append((group, left_args[i], left_args[i + num_streams],))
         if timeout is None:
             return self._xreadgroup(consumer_name, group_params, count, noack, False)
@@ -226,7 +226,7 @@ def xgroup_createconsumer(self, key, group_name, consumer_name):
             raise SimpleError(msgs.XGROUP_KEY_NOT_FOUND_MSG)
         group: StreamGroup = key.value.group_get(group_name)
         if not group:
-            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name))
+            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name.decode()))
         return group.add_consumer(consumer_name)
 
     @command(name="XGROUP DELCONSUMER", fixed=(Key(XStream), bytes, bytes), repeat=(), )
@@ -235,7 +235,7 @@ def xgroup_delconsumer(self, key, group_name, consumer_name):
             raise SimpleError(msgs.XGROUP_KEY_NOT_FOUND_MSG)
         group: StreamGroup = key.value.group_get(group_name)
         if not group:
-            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name))
+            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name.decode()))
         return group.del_consumer(consumer_name)
 
     @command(name="XINFO GROUPS", fixed=(Key(XStream),), repeat=(), )
@@ -257,7 +257,7 @@ def xinfo_consumers(self, key, group_name, ):
             raise SimpleError(msgs.XGROUP_KEY_NOT_FOUND_MSG)
         group: StreamGroup = key.value.group_get(group_name)
         if not group:
-            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name))
+            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name.decode()))
         return group.consumers_info()
 
     @command(name="XCLAIM", fixed=(Key(XStream), bytes, bytes, Int, bytes), repeat=(bytes,), )
@@ -267,7 +267,7 @@ def xclaim(self, key, group_name, consumer_name, min_idle_ms, *args):
             raise SimpleError(msgs.XGROUP_KEY_NOT_FOUND_MSG)
         group: StreamGroup = stream.group_get(group_name)
         if not group:
-            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name))
+            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name.decode()))
 
         (idle, _time, retry, force, justid), msg_ids = extract_args(
             args, ('+idle', '+time', '+retrycount', 'force', 'justid'),
@@ -291,7 +291,7 @@ def xautoclaim(self, key, group_name, consumer_name, min_idle_ms, start, *args):
             raise SimpleError(msgs.XGROUP_KEY_NOT_FOUND_MSG)
         group: StreamGroup = stream.group_get(group_name)
         if not group:
-            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name))
+            raise SimpleError(msgs.XGROUP_GROUP_NOT_FOUND_MSG.format(key, group_name.decode()))
 
         keys = group.read_pel_msgs(min_idle_ms, start, count)
         msgs_claimed, msgs_removed = group.claim(min_idle_ms, keys, consumer_name, None, False)

diff --git a/test/test_mixins/test_streams_commands.py b/test/test_mixins/test_streams_commands.py
@@ -408,6 +408,8 @@ def test_xreadgroup(r: redis.Redis):
         r.xreadgroup(group, consumer, streams={stream: ">"})
     m1 = r.xadd(stream, {"foo": "bar"})
     m2 = r.xadd(stream, {"bing": "baz"})
+    with pytest.raises(redis.exceptions.ResponseError, match="NOGROUP.*group 'group'.*key name 'stream'"):
+        r.xreadgroup(group, consumer, streams={stream: ">"})
     r.xgroup_create(stream, group, 0)
 
     expected = [[