From: Mike Bayer Date: Sun, 23 Jan 2022 14:28:22 +0000 (-0500) Subject: dont test squelched warnings against the filter X-Git-Tag: rel_1_4_32~37^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a334e22bab6194479ca1af1f1f49d012ce918ca6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git dont test squelched warnings against the filter I spent days on Ibcf09af25228d39ee5a943fda82d8a9302433726 reading it over and over again and noticed this slight inaccuracy 10 seconds after I merged it. the assert_warns_message() and assert_warns() functions should not consider a mismatched warning class as valid for a match. Change-Id: Ib8944dd95bcec1a7e4963917a5f4829e2ba27732 (cherry picked from commit f653d5eb169e3d0371eae388aecb0db0cb0b8c11) --- diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py index aa8edd9aff..9a3c06b029 100644 --- a/lib/sqlalchemy/testing/assertions.py +++ b/lib/sqlalchemy/testing/assertions.py @@ -192,6 +192,8 @@ def _expect_warnings( if not exception or not issubclass(exception, _EXC_CLS): if not squelch_other_warnings: return real_warn(msg, *arg, **kw) + else: + return if not filters and not raise_on_any_unexpected: return