From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 31 Aug 2014 22:00:49 +0000 (-0400)
Subject: - refine this a bit to better check for exception type
X-Git-Tag: rel_1_0_0b1~205^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1972331528827aa5de33617b424769c71dcb804d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- refine this a bit to better check for exception type
---

diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index dbe365ad5c..bf7c27a890 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -11,7 +11,7 @@ from . import util as testutil
 from sqlalchemy import pool, orm, util
 from sqlalchemy.engine import default, url
 from sqlalchemy.util import decorator
-from sqlalchemy import types as sqltypes, schema
+from sqlalchemy import types as sqltypes, schema, exc as sa_exc
 import warnings
 import re
 from .exclusions import db_spec, _is_excluded
@@ -33,8 +33,7 @@ def expect_warnings(*messages):
     Note that the test suite sets SAWarning warnings to raise exceptions.
 
     """
-    return _expect_warnings(
-        "sqlalchemy.util.deprecations.warnings.warn", messages)
+    return _expect_warnings(sa_exc.SAWarning, messages)
 
 
 @contextlib.contextmanager
@@ -66,8 +65,7 @@ def emits_warning(*messages):
 
 
 def expect_deprecated(*messages):
-    return _expect_warnings(
-        "sqlalchemy.util.deprecations.warnings.warn", messages)
+    return _expect_warnings(sa_exc.SADeprecationWarning, messages)
 
 
 def emits_warning_on(db, *messages):
@@ -105,13 +103,16 @@ def uses_deprecated(*messages):
 
 
 @contextlib.contextmanager
-def _expect_warnings(to_patch, messages):
+def _expect_warnings(exc_cls, messages):
 
     filters = [re.compile(msg, re.I) for msg in messages]
 
     real_warn = warnings.warn
 
     def our_warn(msg, exception, *arg, **kw):
+        if not issubclass(exception, exc_cls):
+            return real_warn(msg, exception, *arg, **kw)
+
         if not filters:
             return
 
@@ -121,7 +122,7 @@ def _expect_warnings(to_patch, messages):
         else:
             real_warn(msg, exception, *arg, **kw)
 
-    with mock.patch(to_patch, our_warn):
+    with mock.patch("warnings.warn", our_warn):
         yield