From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 6 Jan 2019 18:06:56 +0000 (-0500)
Subject: Fix expect_warnings_on function
X-Git-Tag: rel_1_0_6~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16c905b5f2a24ee7bdb766f9b60ce68e44b7dab0;p=thirdparty%2Fsqlalchemy%2Falembic.git

Fix expect_warnings_on function

This function is not used in Alembic right now but it contained
undefined symbols, re-copy over from SQLAlchemy.

Change-Id: I3eb6eb76dc1d0d83606fa2a4af88300ee802d3bf
---

diff --git a/alembic/testing/assertions.py b/alembic/testing/assertions.py
index 4fb43a4f..2c7382c2 100644
--- a/alembic/testing/assertions.py
+++ b/alembic/testing/assertions.py
@@ -10,6 +10,8 @@ from sqlalchemy.util import decorator
 from sqlalchemy import exc as sa_exc
 import warnings
 from . import mock
+from .exclusions import db_spec
+from . import config
 
 
 if not util.sqla_094:
@@ -127,8 +129,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