summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-06-19 17:18:03 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-06-19 17:18:03 -0400
commit61e83ec41bb0126e1c96a7a648e30a7f515c3ec9 (patch)
tree4e6ff6c7f7931236ddb57918bf9d4740fa492f30
parent7aa2100db3e6f768a280b4dfdb675d6709f94625 (diff)
downloadsqlalchemy-61e83ec41bb0126e1c96a7a648e30a7f515c3ec9.tar.gz
- fixes to the warnings filters
-rw-r--r--lib/sqlalchemy/testing/assertions.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index e0c02c896..01fa0b8a9 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -50,8 +50,6 @@ def expect_warnings_on(db, *messages, **kw):
if isinstance(db, util.string_types) and not spec(config._current):
yield
- elif not _is_excluded(*db):
- yield
else:
with expect_warnings(*messages, **kw):
yield
@@ -90,7 +88,7 @@ def emits_warning_on(db, *messages):
"""
@decorator
def decorate(fn, *args, **kw):
- with expect_warnings_on(db, *messages):
+ with expect_warnings_on(db, assert_=False, *messages):
return fn(*args, **kw)
return decorate