summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-05-21 19:03:32 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-05-21 19:03:32 +0000
commitd45657a2f5b880dc22dda2d1eb1687af5234a470 (patch)
tree5cebf0c4b0d9f12071176bbdc8a4de47cb31b151 /lib/sqlalchemy/testing
parentb67548ad788fc0eb8782dfd5a1d2a016dc5c7f78 (diff)
parent4550983e0ce2f35b3585e53894c941c23693e71d (diff)
downloadsqlalchemy-d45657a2f5b880dc22dda2d1eb1687af5234a470.tar.gz
Merge "Performance fixes for new result set"
Diffstat (limited to 'lib/sqlalchemy/testing')
-rw-r--r--lib/sqlalchemy/testing/assertions.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index 87e5ba0d2..ba4a2de72 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -168,7 +168,9 @@ def _expect_warnings(
else:
real_warn(msg, *arg, **kw)
- with mock.patch("warnings.warn", our_warn):
+ with mock.patch("warnings.warn", our_warn), mock.patch(
+ "sqlalchemy.util.SQLALCHEMY_WARN_20", True
+ ), mock.patch("sqlalchemy.engine.row.LegacyRow._default_key_style", 2):
yield
if assert_ and (not py2konly or not compat.py3k):