applying review comments

Author: petyaslavova

redis/commands/core.py

@@ -2059,10 +2059,10 @@ def msetex(
 
         ``px`` sets an expire flag on the keys in ``mapping`` for ``px`` milliseconds.
 
-        ``exat`` sets an expire flag on the keys in ``mapping`` for ``ex`` seconds,
+        ``exat`` sets an expire flag on the keys in ``mapping`` for ``exat`` seconds,
             specified in unix time.
 
-        ``pxat`` sets an expire flag on the keys in ``mapping`` for ``ex`` milliseconds,
+        ``pxat`` sets an expire flag on the keys in ``mapping`` for ``pxat`` milliseconds,
             specified in unix time.
 
         ``keepttl`` if True, retain the time to live associated with the keys.

tests/test_asyncio/test_commands.py

@@ -1244,15 +1244,15 @@ async def test_msetex_expiration_ex_and_keepttl_with_cluster_client(self, r):
             )
             == 1
         )
-        ttls = [await r.ttl(key) for key in all_test_keys]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in all_test_keys])
         for ttl in ttls:
             assert pytest.approx(ttl) == 10
 
         assert await r.mget(*all_test_keys) == [b"1", b"2"]
         await asyncio.sleep(1.1)
         # validate keepttl
         assert await r.msetex(mapping={"1:{test:1}": 11}, keepttl=True) == 1
-        assert await r.ttl("1") < 10
+        assert await r.ttl("1:{test:1}") < 10
 
     @pytest.mark.onlycluster
     @skip_if_server_version_lt("8.3.224")
@@ -1266,7 +1266,7 @@ async def test_msetex_expiration_px_with_cluster_client(self, r):
         # with expiration - testing px field
         assert await r.msetex(mapping=mapping, px=60000) == 1
 
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         for ttl in ttls:
             assert pytest.approx(ttl) == 60
         assert await r.mget(*mapping.keys()) == [b"1", b"2"]
@@ -1297,7 +1297,7 @@ async def test_msetex_expiration_pxat_and_nx_with_cluster_client(self, r):
             )
             == 0
         )
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         for ttl in ttls:
             assert 10 < ttl <= 30
         assert await r.mget(*mapping.keys(), "new:{test:1}") == [
@@ -1316,8 +1316,8 @@ async def test_msetex_expiration_pxat_and_nx_with_cluster_client(self, r):
             )
             == 1
         )
-        old_ttls = [await r.ttl(key) for key in mapping.keys()]
-        new_ttls = [await r.ttl(key) for key in ["new:{test:1}", "new_2:{test:1}"]]
+        old_ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
+        new_ttls = await asyncio.gather(*(r.ttl(key) for key in ["new", "new_2"]))
         for ttl in old_ttls:
             assert 10 < ttl <= 30
         for ttl in new_ttls:
@@ -1350,7 +1350,7 @@ async def test_msetex_expiration_exat_and_xx_with_cluster_client(self, r):
             )
             == 0
         )
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         for ttl in ttls:
             assert 10 < ttl <= 30
         assert await r.mget(*mapping.keys(), "new:{test:1}") == [
@@ -1369,7 +1369,7 @@ async def test_msetex_expiration_exat_and_xx_with_cluster_client(self, r):
             )
             == 1
         )
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         assert ttls[0] <= 10
         assert ttls[1] <= 10
         assert 10 < ttls[2] <= 30
@@ -1417,7 +1417,7 @@ async def test_msetex_expiration_ex_and_keepttl(self, r):
             )
             == 1
         )
-        ttls = [await r.ttl(key) for key in all_test_keys]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in all_test_keys])
         for ttl in ttls:
             assert pytest.approx(ttl) == 10
 
@@ -1439,7 +1439,7 @@ async def test_msetex_expiration_px(self, r):
         # with expiration - testing px field
         assert await r.msetex(mapping=mapping, px=60000) == 1
 
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         for ttl in ttls:
             assert pytest.approx(ttl) == 60
         assert await r.mget(*mapping.keys()) == [b"1", b"2"]
@@ -1464,7 +1464,7 @@ async def test_msetex_expiration_pxat_and_nx(self, r):
             )
             == 0
         )
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         for ttl in ttls:
             assert 10 < ttl <= 30
         assert await r.mget(*mapping.keys(), "new") == [b"1", b"2", b"three", None]
@@ -1478,8 +1478,8 @@ async def test_msetex_expiration_pxat_and_nx(self, r):
             )
             == 1
         )
-        old_ttls = [await r.ttl(key) for key in mapping.keys()]
-        new_ttls = [await r.ttl(key) for key in ["new", "new_2"]]
+        old_ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
+        new_ttls = await asyncio.gather(*(r.ttl(key) for key in ["new", "new_2"]))
         for ttl in old_ttls:
             assert 10 < ttl <= 30
         for ttl in new_ttls:
@@ -1512,7 +1512,7 @@ async def test_msetex_expiration_exat_and_xx(self, r):
             )
             == 0
         )
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         for ttl in ttls:
             assert 10 < ttl <= 30
         assert await r.mget(*mapping.keys(), "new") == [b"1", b"2", b"three", None]
@@ -1526,7 +1526,7 @@ async def test_msetex_expiration_exat_and_xx(self, r):
             )
             == 1
         )
-        ttls = [await r.ttl(key) for key in mapping.keys()]
+        ttls = await asyncio.gather(*[r.ttl(key) for key in mapping.keys()])
         assert ttls[0] <= 10
         assert ttls[1] <= 10
         assert 10 < ttls[2] <= 30

tests/test_commands.py

@@ -1851,7 +1851,7 @@ def test_msetex_expiration_ex_and_keepttl_with_cluster_client(self, r):
         time.sleep(1.1)
         # validate keepttl
         assert r.msetex(mapping={"1:{test:1}": 11}, keepttl=True) == 1
-        assert r.ttl("1") < 10
+        assert r.ttl("1:{test:1}") < 10
 
     @pytest.mark.onlycluster
     @skip_if_server_version_lt("8.3.224")
@@ -2017,7 +2017,7 @@ def test_msetex_expiration_ex_and_keepttl(self, r):
     @pytest.mark.onlynoncluster
     @skip_if_server_version_lt("8.3.224")
     def test_msetex_expiration_px(self, r):
-        all_test_keys = ["1:{test:1}", "2:{test:1}"]
+        all_test_keys = ["1", "2"]
         for key in all_test_keys:
             r.delete(key)