From 6fd073b9125fdfb895543a07167c6a4f6026d941 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 7 Aug 2014 12:36:50 -0400 Subject: [PATCH] - take out the iterator approach here as it does not support concurrent access --- test/engine/test_pool.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 0ad26e8909..0c4557d49f 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -12,25 +12,26 @@ from sqlalchemy.testing.mock import Mock, call join_timeout = 10 + def MockDBAPI(): def cursor(): - while True: - yield Mock() + return Mock() - def connect(): - while True: - yield Mock(cursor=Mock(side_effect=cursor())) + def connect(*arg, **kw): + return Mock(cursor=Mock(side_effect=cursor)) def shutdown(value): if value: db.connect = Mock(side_effect=Exception("connect failed")) else: - db.connect = Mock(side_effect=connect()) + db.connect = Mock(side_effect=connect) - db = Mock(connect=Mock(side_effect=connect()), - shutdown=shutdown, _shutdown=False) + db = Mock( + connect=Mock(side_effect=connect), + shutdown=shutdown, _shutdown=False) return db + class PoolTestBase(fixtures.TestBase): def setup(self): pool.clear_managers() -- 2.47.3