From: Denis Laxalde <denis.laxalde@dalibo.com>
Date: Tue, 2 Nov 2021 12:34:42 +0000 (+0100)
Subject: Avoid unassigned list comprehensions in pool tests
X-Git-Tag: 3.0.2~2^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c3a67f93b43b879c749964004cf9bfbb17470d3;p=thirdparty%2Fpsycopg.git

Avoid unassigned list comprehensions in pool tests

Mypy complains that Thread.start()/join() does not return a value.
---

diff --git a/tests/pool/test_pool.py b/tests/pool/test_pool.py
index b007aecda..9931fb765 100644
--- a/tests/pool/test_pool.py
+++ b/tests/pool/test_pool.py
@@ -304,8 +304,10 @@ def test_queue(dsn, retries):
             with pool.ConnectionPool(dsn, min_size=2) as p:
                 p.wait()
                 ts = [Thread(target=worker, args=(i,)) for i in range(6)]
-                [t.start() for t in ts]
-                [t.join() for t in ts]
+                for t in ts:
+                    t.start()
+                for t in ts:
+                    t.join()
 
             times = [item[1] for item in results]
             want_times = [0.2, 0.2, 0.4, 0.4, 0.6, 0.6]
@@ -339,8 +341,10 @@ def test_queue_size(dsn):
         ev.wait()
 
         ts = [Thread(target=worker, args=(0.1,)) for i in range(4)]
-        [t.start() for t in ts]
-        [t.join() for t in ts]
+        for t in ts:
+            t.start()
+        for t in ts:
+            t.join()
 
     assert len(success) == 4
     assert len(errors) == 1
@@ -374,8 +378,10 @@ def test_queue_timeout(dsn, retries):
 
             with pool.ConnectionPool(dsn, min_size=2, timeout=0.1) as p:
                 ts = [Thread(target=worker, args=(i,)) for i in range(4)]
-                [t.start() for t in ts]
-                [t.join() for t in ts]
+                for t in ts:
+                    t.start()
+                for t in ts:
+                    t.join()
 
             assert len(results) == 2
             assert len(errors) == 2
@@ -402,8 +408,10 @@ def test_dead_client(dsn):
             Thread(target=worker, args=(i, timeout))
             for i, timeout in enumerate([0.4, 0.4, 0.1, 0.4, 0.4])
         ]
-        [t.start() for t in ts]
-        [t.join() for t in ts]
+        for t in ts:
+            t.start()
+        for t in ts:
+            t.join()
         sleep(0.2)
         assert set(results) == set([0, 1, 3, 4])
         assert len(p._pool) == 2  # no connection was lost
@@ -434,8 +442,10 @@ def test_queue_timeout_override(dsn, retries):
 
             with pool.ConnectionPool(dsn, min_size=2, timeout=0.1) as p:
                 ts = [Thread(target=worker, args=(i,)) for i in range(4)]
-                [t.start() for t in ts]
-                [t.join() for t in ts]
+                for t in ts:
+                    t.start()
+                for t in ts:
+                    t.join()
 
             assert len(results) == 3
             assert len(errors) == 1
@@ -675,8 +685,10 @@ def test_grow(dsn, monkeypatch, retries):
                 results = []
 
                 ts = [Thread(target=worker, args=(i,)) for i in range(6)]
-                [t.start() for t in ts]
-                [t.join() for t in ts]
+                for t in ts:
+                    t.start()
+                for t in ts:
+                    t.join()
 
             want_times = [0.2, 0.2, 0.3, 0.4, 0.4, 0.4]
             times = [item[1] for item in results]
@@ -710,8 +722,10 @@ def test_shrink(dsn, monkeypatch):
         assert p.max_idle == 0.2
 
         ts = [Thread(target=worker, args=(i,)) for i in range(4)]
-        [t.start() for t in ts]
-        [t.join() for t in ts]
+        for t in ts:
+            t.start()
+        for t in ts:
+            t.join()
         sleep(1)
 
     assert results == [(4, 4), (4, 3), (3, 2), (2, 2), (2, 2)]
@@ -924,10 +938,12 @@ def test_stats_measures(dsn):
         assert stats["requests_waiting"] == 0
 
         ts = [Thread(target=worker, args=(i,)) for i in range(3)]
-        [t.start() for t in ts]
+        for t in ts:
+            t.start()
         sleep(0.1)
         stats = p.get_stats()
-        [t.join() for t in ts]
+        for t in ts:
+            t.join()
         assert stats["pool_min"] == 2
         assert stats["pool_max"] == 4
         assert stats["pool_size"] == 3
@@ -936,10 +952,12 @@ def test_stats_measures(dsn):
 
         p.wait(2.0)
         ts = [Thread(target=worker, args=(i,)) for i in range(7)]
-        [t.start() for t in ts]
+        for t in ts:
+            t.start()
         sleep(0.1)
         stats = p.get_stats()
-        [t.join() for t in ts]
+        for t in ts:
+            t.join()
         assert stats["pool_min"] == 2
         assert stats["pool_max"] == 4
         assert stats["pool_size"] == 4
@@ -963,8 +981,10 @@ def test_stats_usage(dsn, retries):
                 p.wait(2.0)
 
                 ts = [Thread(target=worker, args=(i,)) for i in range(7)]
-                [t.start() for t in ts]
-                [t.join() for t in ts]
+                for t in ts:
+                    t.start()
+                for t in ts:
+                    t.join()
                 stats = p.get_stats()
                 assert stats["requests_num"] == 7
                 assert stats["requests_queued"] == 4
@@ -1019,8 +1039,10 @@ def test_spike(dsn, monkeypatch):
         p.wait()
 
         ts = [Thread(target=worker) for i in range(50)]
-        [t.start() for t in ts]
-        [t.join() for t in ts]
+        for t in ts:
+            t.start()
+        for t in ts:
+            t.join()
         p.wait()
 
         assert len(p._pool) < 7