From 604df86190359c8516594a21c42be0cdf10b6492 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 30 Nov 2013 16:54:44 -0500 Subject: [PATCH] make sure thread.join() is used completely here --- test/engine/test_pool.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index a59a040d65..c395dd8258 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -899,12 +899,12 @@ class QueuePoolTest(PoolTestBase): c1 = p.connect() c2 = p.connect() - threads = set() + threads = [] for i in range(2): t = threading.Thread(target=waiter, args=(p, timeout, max_overflow)) t.start() - threads.add(t) + threads.append(t) c1.invalidate() c2.invalidate() @@ -938,14 +938,18 @@ class QueuePoolTest(PoolTestBase): c1 = p1.connect() + threads = [] for i in range(5): t = threading.Thread(target=waiter, args=(p1, )) - t.setDaemon(True) t.start() + threads.append(t) time.sleep(.5) eq_(canary, [1]) p1._pool.abort(p2) - time.sleep(1) + + for t in threads: + t.join(join_timeout) + eq_(canary, [1, 2, 2, 2, 2, 2]) def test_dispose_closes_pooled(self): -- 2.47.3