From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 19 Jun 2015 21:18:03 +0000 (-0400)
Subject: - fixes to the warnings filters
X-Git-Tag: rel_1_0_6~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61e83ec41bb0126e1c96a7a648e30a7f515c3ec9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fixes to the warnings filters
---

diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index e0c02c896b..01fa0b8a98 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