]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
Simpler, more approximative, more reliable pool max lifetime test
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Mon, 8 Mar 2021 01:59:05 +0000 (02:59 +0100)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Fri, 12 Mar 2021 04:07:25 +0000 (05:07 +0100)
tests/pool/test_pool.py
tests/pool/test_pool_async.py

index 219541754019f42f019b0e8af3d8dcf867b81409..ea15d5cb3f4acff5c7067e368f652b1961fdcf1d 100644 (file)
@@ -686,18 +686,16 @@ def test_jitter():
 
 
 @pytest.mark.slow
-def test_max_lifetime(dsn, retries):
-    for retry in retries:
-        with retry:
-            with pool.ConnectionPool(dsn, minconn=1, max_lifetime=0.2) as p:
-                sleep(0.1)
-                pids = []
-                for i in range(5):
-                    with p.connection() as conn:
-                        pids.append(conn.pgconn.backend_pid)
-                    sleep(0.2)
+def test_max_lifetime(dsn):
+    with pool.ConnectionPool(dsn, minconn=1, max_lifetime=0.2) as p:
+        sleep(0.1)
+        pids = []
+        for i in range(5):
+            with p.connection() as conn:
+                pids.append(conn.pgconn.backend_pid)
+            sleep(0.2)
 
-            assert pids[0] == pids[1] != pids[2] == pids[3] != pids[4], pids
+    assert pids[0] == pids[1] != pids[4], pids
 
 
 def test_check(dsn, caplog):
index 7c4842cc18fb9e752d8a728f666393c71be6cc3f..24eb38e67b8ee679e3c5e212e05c0076e46397e9 100644 (file)
@@ -710,20 +710,16 @@ def test_jitter():
 
 
 @pytest.mark.slow
-async def test_max_lifetime(dsn, retries):
-    async for retry in retries:
-        with retry:
-            async with pool.AsyncConnectionPool(
-                dsn, minconn=1, max_lifetime=0.2
-            ) as p:
-                await asyncio.sleep(0.1)
-                pids = []
-                for i in range(5):
-                    async with p.connection() as conn:
-                        pids.append(conn.pgconn.backend_pid)
-                    await asyncio.sleep(0.2)
+async def test_max_lifetime(dsn):
+    async with pool.AsyncConnectionPool(dsn, minconn=1, max_lifetime=0.2) as p:
+        await asyncio.sleep(0.1)
+        pids = []
+        for i in range(5):
+            async with p.connection() as conn:
+                pids.append(conn.pgconn.backend_pid)
+            await asyncio.sleep(0.2)
 
-            assert pids[0] == pids[1] != pids[2] == pids[3] != pids[4], pids
+    assert pids[0] == pids[1] != pids[4], pids
 
 
 def delay_connection(monkeypatch, sec):