Merge branch 'master' into DOC-4560-trans-pipe-examples

Author: andy-stark-redis

redis/_parsers/helpers.py

@@ -396,13 +396,20 @@ def parse_item(item):
         # an O(N) complexity) instead of the command.
         if isinstance(item[3], list):
             result["command"] = space.join(item[3])
-            result["client_address"] = item[4]
-            result["client_name"] = item[5]
+
+            # These fields are optional, depends on environment.
+            if len(item) >= 6:
+                result["client_address"] = item[4]
+                result["client_name"] = item[5]
         else:
             result["complexity"] = item[3]
             result["command"] = space.join(item[4])
-            result["client_address"] = item[5]
-            result["client_name"] = item[6]
+
+            # These fields are optional, depends on environment.
+            if len(item) >= 7:
+                result["client_address"] = item[5]
+                result["client_name"] = item[6]
+
         return result
 
     return [parse_item(item) for item in response]

redis/asyncio/connection.py

@@ -214,7 +214,13 @@ def __del__(self, _warnings: Any = warnings):
             _warnings.warn(
                 f"unclosed Connection {self!r}", ResourceWarning, source=self
             )
-            self._close()
+
+            try:
+                asyncio.get_running_loop()
+                self._close()
+            except RuntimeError:
+                # No actions been taken if pool already closed.
+                pass
 
     def _close(self):
         """

redis/asyncio/sentinel.py

@@ -29,11 +29,7 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
     def __repr__(self):
-        pool = self.connection_pool
-        s = (
-            f"<{self.__class__.__module__}.{self.__class__.__name__}"
-            f"(service={pool.service_name}"
-        )
+        s = f"<{self.__class__.__module__}.{self.__class__.__name__}"
         if self.host:
             host_info = f",host={self.host},port={self.port}"
             s += host_info

tests/test_asyncio/test_hash.py

@@ -1,4 +1,5 @@
 import asyncio
+import math
 from datetime import datetime, timedelta
 
 from tests.conftest import skip_if_server_version_lt
@@ -128,9 +129,9 @@ async def test_hpexpire_multiple_fields(r):
 async def test_hexpireat_basic(r):
     await r.delete("test:hash")
     await r.hset("test:hash", mapping={"field1": "value1", "field2": "value2"})
-    exp_time = int((datetime.now() + timedelta(seconds=1)).timestamp())
+    exp_time = math.ceil((datetime.now() + timedelta(seconds=1)).timestamp())
     assert await r.hexpireat("test:hash", exp_time, "field1") == [1]
-    await asyncio.sleep(1.1)
+    await asyncio.sleep(2.1)
     assert await r.hexists("test:hash", "field1") is False
     assert await r.hexists("test:hash", "field2") is True
 
@@ -139,9 +140,9 @@ async def test_hexpireat_basic(r):
 async def test_hexpireat_with_datetime(r):
     await r.delete("test:hash")
     await r.hset("test:hash", mapping={"field1": "value1", "field2": "value2"})
-    exp_time = datetime.now() + timedelta(seconds=1)
+    exp_time = (datetime.now() + timedelta(seconds=2)).replace(microsecond=0)
     assert await r.hexpireat("test:hash", exp_time, "field1") == [1]
-    await asyncio.sleep(1.1)
+    await asyncio.sleep(2.1)
     assert await r.hexists("test:hash", "field1") is False
     assert await r.hexists("test:hash", "field2") is True
 
@@ -175,9 +176,9 @@ async def test_hexpireat_multiple_fields(r):
         "test:hash",
         mapping={"field1": "value1", "field2": "value2", "field3": "value3"},
     )
-    exp_time = int((datetime.now() + timedelta(seconds=1)).timestamp())
+    exp_time = math.ceil((datetime.now() + timedelta(seconds=1)).timestamp())
     assert await r.hexpireat("test:hash", exp_time, "field1", "field2") == [1, 1]
-    await asyncio.sleep(1.5)
+    await asyncio.sleep(2.1)
     assert await r.hexists("test:hash", "field1") is False
     assert await r.hexists("test:hash", "field2") is False
     assert await r.hexists("test:hash", "field3") is True

tests/test_asyncio/test_sentinel.py

@@ -264,3 +264,23 @@ async def mock_disconnect():
 
     assert calls == 1
     await pool.disconnect()
+
+
+@pytest.mark.onlynoncluster
+async def test_repr_correctly_represents_connection_object(sentinel):
+    pool = SentinelConnectionPool("mymaster", sentinel)
+    connection = await pool.get_connection("PING")
+
+    assert (
+        str(connection)
+        == "<redis.asyncio.sentinel.SentinelManagedConnection,host=127.0.0.1,port=6379)>"  # noqa: E501
+    )
+    assert connection.connection_pool == pool
+    await pool.release(connection)
+
+    del pool
+
+    assert (
+        str(connection)
+        == "<redis.asyncio.sentinel.SentinelManagedConnection,host=127.0.0.1,port=6379)>"  # noqa: E501
+    )

tests/test_hash.py

@@ -1,3 +1,4 @@
+import math
 import time
 from datetime import datetime, timedelta
 
@@ -147,9 +148,9 @@ def test_hpexpire_multiple_condition_flags_error(r):
 def test_hexpireat_basic(r):
     r.delete("test:hash")
     r.hset("test:hash", mapping={"field1": "value1", "field2": "value2"})
-    exp_time = int((datetime.now() + timedelta(seconds=1)).timestamp())
+    exp_time = math.ceil((datetime.now() + timedelta(seconds=1)).timestamp())
     assert r.hexpireat("test:hash", exp_time, "field1") == [1]
-    time.sleep(1.1)
+    time.sleep(2.1)
     assert r.hexists("test:hash", "field1") is False
     assert r.hexists("test:hash", "field2") is True
 
@@ -158,9 +159,9 @@ def test_hexpireat_basic(r):
 def test_hexpireat_with_datetime(r):
     r.delete("test:hash")
     r.hset("test:hash", mapping={"field1": "value1", "field2": "value2"})
-    exp_time = datetime.now() + timedelta(seconds=1)
+    exp_time = (datetime.now() + timedelta(seconds=2)).replace(microsecond=0)
     assert r.hexpireat("test:hash", exp_time, "field1") == [1]
-    time.sleep(1.1)
+    time.sleep(2.1)
     assert r.hexists("test:hash", "field1") is False
     assert r.hexists("test:hash", "field2") is True
 
@@ -194,9 +195,9 @@ def test_hexpireat_multiple_fields(r):
         "test:hash",
         mapping={"field1": "value1", "field2": "value2", "field3": "value3"},
     )
-    exp_time = int((datetime.now() + timedelta(seconds=1)).timestamp())
+    exp_time = math.ceil((datetime.now() + timedelta(seconds=1)).timestamp())
     assert r.hexpireat("test:hash", exp_time, "field1", "field2") == [1, 1]
-    time.sleep(1.1)
+    time.sleep(2.1)
     assert r.hexists("test:hash", "field1") is False
     assert r.hexists("test:hash", "field2") is False
     assert r.hexists("test:hash", "field3") is True

tests/test_json.py

@@ -1521,8 +1521,8 @@ def test_set_path(client):
 
     root = tempfile.mkdtemp()
     sub = tempfile.mkdtemp(dir=root)
-    jsonfile = tempfile.mktemp(suffix=".json", dir=sub)
-    nojsonfile = tempfile.mktemp(dir=root)
+    jsonfile = tempfile.mkstemp(suffix=".json", dir=sub)[1]
+    nojsonfile = tempfile.mkstemp(dir=root)[1]
 
     with open(jsonfile, "w+") as fp:
         fp.write(json.dumps({"hello": "world"}))