- fixes to the warnings filters

diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index e0c02c896b5f043de460577c73f96b3796237cdc..01fa0b8a988b670a6fcd922bc3f27ea20284990d 100644 (file)
--- 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