diff options
Diffstat (limited to 'test/engine/test_pool.py')
| -rw-r--r-- | test/engine/test_pool.py | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 1d31c16b5..260f461d0 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -1,5 +1,6 @@ -import threading, time -from sqlalchemy import pool, interfaces, select, event +import threading +import time +from sqlalchemy import pool, select, event import sqlalchemy as tsa from sqlalchemy import testing from sqlalchemy.testing.util import gc_collect, lazy_gc @@ -89,10 +90,10 @@ class PoolTest(PoolTestBase): def test_bad_args(self): manager = pool.manage(MockDBAPI()) - connection = manager.connect(None) + manager.connect(None) def test_non_thread_local_manager(self): - manager = pool.manage(MockDBAPI(), use_threadlocal = False) + manager = pool.manage(MockDBAPI(), use_threadlocal=False) connection = manager.connect('foo.db') connection2 = manager.connect('foo.db') @@ -455,7 +456,8 @@ class PoolEventsTest(PoolTestBase): engine.execute(select([1])).close() eq_( - canary, ["listen_one","listen_four", "listen_two","listen_three"] + canary, + ["listen_one", "listen_four", "listen_two", "listen_three"] ) def test_listen_targets_per_subclass(self): @@ -794,7 +796,7 @@ class QueuePoolTest(PoolTestBase): try: c4 = p.connect() assert False - except tsa.exc.TimeoutError as e: + except tsa.exc.TimeoutError: assert int(time.time() - now) == 2 def test_timeout_race(self): @@ -807,16 +809,16 @@ class QueuePoolTest(PoolTestBase): # them back to the start of do_get() dbapi = MockDBAPI() p = pool.QueuePool( - creator = lambda: dbapi.connect(delay=.05), - pool_size = 2, - max_overflow = 1, use_threadlocal = False, timeout=3) + creator=lambda: dbapi.connect(delay=.05), + pool_size=2, + max_overflow=1, use_threadlocal=False, timeout=3) timeouts = [] def checkout(): for x in range(1): now = time.time() try: c1 = p.connect() - except tsa.exc.TimeoutError as e: + except tsa.exc.TimeoutError: timeouts.append(time.time() - now) continue time.sleep(4) @@ -835,7 +837,7 @@ class QueuePoolTest(PoolTestBase): assert t >= 3, "Not all timeouts were >= 3 seconds %r" % timeouts # normally, the timeout should under 4 seconds, # but on a loaded down buildbot it can go up. - assert t < 10, "Not all timeouts were < 10 seconds %r" % timeouts + assert t < 14, "Not all timeouts were < 14 seconds %r" % timeouts def _test_overflow(self, thread_count, max_overflow): gc_collect() @@ -899,7 +901,7 @@ class QueuePoolTest(PoolTestBase): for i in range(2): t = threading.Thread(target=waiter, args=(p, )) - t.setDaemon(True) # so the tests dont hang if this fails + t.setDaemon(True) # so the tests dont hang if this fails t.start() c1.invalidate() @@ -1064,7 +1066,7 @@ class QueuePoolTest(PoolTestBase): assert id(c3.connection) != c_id def test_invalidate(self): - p = self._queuepool_fixture(pool_size=1, max_overflow=0) + p = self._queuepool_fixture(pool_size=1, max_overflow=0) c1 = p.connect() c_id = c1.connection.id c1.close() @@ -1175,13 +1177,13 @@ class SingletonThreadPoolTest(PoolTestBase): class AssertionPoolTest(PoolTestBase): def test_connect_error(self): dbapi = MockDBAPI() - p = pool.AssertionPool(creator = lambda: dbapi.connect('foo.db')) + p = pool.AssertionPool(creator=lambda: dbapi.connect('foo.db')) c1 = p.connect() assert_raises(AssertionError, p.connect) def test_connect_multiple(self): dbapi = MockDBAPI() - p = pool.AssertionPool(creator = lambda: dbapi.connect('foo.db')) + p = pool.AssertionPool(creator=lambda: dbapi.connect('foo.db')) c1 = p.connect() c1.close() c2 = p.connect() @@ -1193,10 +1195,11 @@ class AssertionPoolTest(PoolTestBase): class NullPoolTest(PoolTestBase): def test_reconnect(self): dbapi = MockDBAPI() - p = pool.NullPool(creator = lambda: dbapi.connect('foo.db')) + p = pool.NullPool(creator=lambda: dbapi.connect('foo.db')) c1 = p.connect() c_id = c1.connection.id - c1.close(); c1=None + c1.close() + c1 = None c1 = p.connect() dbapi.raise_error = True |