Adding async tests; Add docstrings info for the new arg; removed unused option

Author: petyaslavova

redis/commands/core.py

@@ -4786,14 +4786,15 @@ def zrank(
         The optional WITHSCORE argument supplements the command's
         reply with the score of the element returned.
 
+        ``score_cast_func`` a callable used to cast the score return value
+
         For more information, see https://redis.io/commands/zrank
         """
         pieces = ["ZRANK", name, value]
         if withscore:
             pieces.append("WITHSCORE")
 
         options = {"withscore": withscore, "score_cast_func": score_cast_func}
-        options["keys"] = [name]
 
         return self.execute_command(*pieces, **options)
 
@@ -4851,14 +4852,15 @@ def zrevrank(
         The optional ``withscore`` argument supplements the command's
         reply with the score of the element returned.
 
+        ``score_cast_func`` a callable used to cast the score return value
+
         For more information, see https://redis.io/commands/zrevrank
         """
         pieces = ["ZREVRANK", name, value]
         if withscore:
             pieces.append("WITHSCORE")
 
         options = {"withscore": withscore, "score_cast_func": score_cast_func}
-        options["keys"] = name
 
         return self.execute_command(*pieces, **options)
 
@@ -4883,6 +4885,8 @@ def zunion(
         Scores will be aggregated based on the ``aggregate``, or SUM if
         none is provided.
 
+        ``score_cast_func`` a callable used to cast the score return value
+
         For more information, see https://redis.io/commands/zunion
         """
         return self._zaggregate(

tests/test_asyncio/test_commands.py

@@ -23,6 +23,7 @@
 from redis.commands.json.path import Path
 from redis.commands.search.field import TextField
 from redis.commands.search.query import Query
+from redis.utils import safe_str
 from tests.conftest import (
     assert_resp_response,
     assert_resp_response_in,
@@ -2071,11 +2072,14 @@ async def test_zrange(self, r: redis.Redis):
             r, response, [(b"a2", 2.0), (b"a3", 3.0)], [[b"a2", 2.0], [b"a3", 3.0]]
         )
 
-        # custom score function
-        # assert await r.zrange("a", 0, 1, withscores=True, score_cast_func=int) == [
-        #     (b"a1", 1),
-        #     (b"a2", 2),
-        # ]
+        # custom score cast function
+        response = await r.zrange("a", 0, 1, withscores=True, score_cast_func=safe_str)
+        assert_resp_response(
+            r,
+            response,
+            [(b"a1", "1"), (b"a2", "2")],
+            [[b"a1", "1.0"], [b"a2", "2.0"]],
+        )
 
     @skip_if_server_version_lt("2.8.9")
     async def test_zrangebylex(self, r: redis.Redis):
@@ -2127,6 +2131,15 @@ async def test_zrangebyscore(self, r: redis.Redis):
             [(b"a2", 2), (b"a3", 3), (b"a4", 4)],
             [[b"a2", 2], [b"a3", 3], [b"a4", 4]],
         )
+        response = await r.zrangebyscore(
+            "a", 2, 4, withscores=True, score_cast_func=safe_str
+        )
+        assert_resp_response(
+            r,
+            response,
+            [(b"a2", "2"), (b"a3", "3"), (b"a4", "4")],
+            [[b"a2", "2.0"], [b"a3", "3.0"], [b"a4", "4.0"]],
+        )
 
     async def test_zrank(self, r: redis.Redis):
         await r.zadd("a", {"a1": 1, "a2": 2, "a3": 3, "a4": 4, "a5": 5})
@@ -2141,10 +2154,14 @@ async def test_zrank_withscore(self, r: redis.Redis):
         assert await r.zrank("a", "a2") == 1
         assert await r.zrank("a", "a6") is None
         assert_resp_response(
-            r, await r.zrank("a", "a3", withscore=True), [2, b"3"], [2, 3.0]
+            r, await r.zrank("a", "a3", withscore=True), [2, 3.0], [2, 3.0]
         )
         assert await r.zrank("a", "a6", withscore=True) is None
 
+        # custom score cast function
+        response = await r.zrank("a", "a3", withscore=True, score_cast_func=safe_str)
+        assert_resp_response(r, response, [2, "3"], [2, "3.0"])
+
     async def test_zrem(self, r: redis.Redis):
         await r.zadd("a", {"a1": 1, "a2": 2, "a3": 3})
         assert await r.zrem("a", "a2") == 1
@@ -2200,6 +2217,19 @@ async def test_zrevrange(self, r: redis.Redis):
             r, response, [(b"a3", 3), (b"a2", 2)], [[b"a3", 3], [b"a2", 2]]
         )
 
+        # custom score cast function
+        # should be applied to resp2 and resp3
+        # responses
+        response = await r.zrevrange(
+            "a", 0, 1, withscores=True, score_cast_func=safe_str
+        )
+        assert_resp_response(
+            r,
+            response,
+            [(b"a3", "3"), (b"a2", "2")],
+            [[b"a3", "3.0"], [b"a2", "2.0"]],
+        )
+
     async def test_zrevrangebyscore(self, r: redis.Redis):
         await r.zadd("a", {"a1": 1, "a2": 2, "a3": 3, "a4": 4, "a5": 5})
         assert await r.zrevrangebyscore("a", 4, 2) == [b"a4", b"a3", b"a2"]
@@ -2240,7 +2270,7 @@ async def test_zrevrank_withscore(self, r: redis.Redis):
         assert await r.zrevrank("a", "a2") == 3
         assert await r.zrevrank("a", "a6") is None
         assert_resp_response(
-            r, await r.zrevrank("a", "a3", withscore=True), [2, b"3"], [2, 3.0]
+            r, await r.zrevrank("a", "a3", withscore=True), [2, 3.0], [2, 3.0]
         )
         assert await r.zrevrank("a", "a6", withscore=True) is None