From 2e62a66aece19a464c9129fab7f915554f055769 Mon Sep 17 00:00:00 2001 From: irina Date: Mon, 14 Jan 2019 23:13:42 +0100 Subject: [PATCH] fixes : #3689 --- lib/sqlalchemy/pool/impl.py | 2 +- test/engine/test_pool.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/pool/impl.py b/lib/sqlalchemy/pool/impl.py index 7828715f8a..648657ed51 100644 --- a/lib/sqlalchemy/pool/impl.py +++ b/lib/sqlalchemy/pool/impl.py @@ -183,7 +183,7 @@ class QueuePool(Pool): return self._pool.maxsize def timeout(self): - return self._pool._timeout + return self._timeout def checkedin(self): return self._pool.qsize() diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index b713fdeee4..3fcf4e09a8 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -1117,7 +1117,7 @@ class QueuePoolTest(PoolTestBase): expected_timeout = 123 p = self._queuepool_fixture( timeout=expected_timeout) - assert p.timeout() == expected_timeout + assert eq_(p.timeout(), expected_timeout) @testing.requires.timing_intensive def test_timeout(self): -- 2.47.3