diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-01-22 02:05:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-01-22 02:05:20 +0000 |
| commit | fd4ab9bbe19bb79d91a66f1458848fbe7d65b144 (patch) | |
| tree | ca0092de8f60c6b050080718eff251d978554e3f /lib/sqlalchemy/testing | |
| parent | d46a4c0326bd2e697794514b920e6727d5153324 (diff) | |
| parent | 9b2cd1ede5951fff7180d64bb39aa3a601ec1900 (diff) | |
| download | sqlalchemy-fd4ab9bbe19bb79d91a66f1458848fbe7d65b144.tar.gz | |
Merge "Remove dispose warning on async engines when running tests" into main
Diffstat (limited to 'lib/sqlalchemy/testing')
| -rw-r--r-- | lib/sqlalchemy/testing/engines.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py index 8ce70d9c2..0310825bc 100644 --- a/lib/sqlalchemy/testing/engines.py +++ b/lib/sqlalchemy/testing/engines.py @@ -19,6 +19,7 @@ from .util import decorator from .util import gc_collect from .. import event from .. import pool +from ..util import await_only from ..util.typing import Literal @@ -105,7 +106,10 @@ class ConnectionKiller: and proxy_ref._pool is rec.pool ): self._safe(proxy_ref._checkin) - rec.dispose() + if hasattr(rec, "sync_engine"): + await_only(rec.dispose()) + else: + rec.dispose() eng.clear() def after_test(self): @@ -332,6 +336,7 @@ def testing_engine( from sqlalchemy.pool import StaticPool if config.db is not None and isinstance(config.db.pool, StaticPool): + use_reaper = False engine.pool._transfer_from(config.db.pool) if scope == "global": |
