floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add better warning msg for deprecated warns(None)

This commit is contained in:
Olga Matoula 2021-05-16 12:07:39 +01:00
parent 6ae71a2c2b
commit dbe66d97b4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/_pytest/deprecated.py
View File

@ -103,7 +103,8 @@ HOOK_LEGACY_PATH_ARG = UnformattedWarning(
) )
WARNS_NONE_ARG = PytestDeprecationWarning( WARNS_NONE_ARG = PytestDeprecationWarning(
"Please pass an explicit Warning type or tuple of Warning types." "Passing None to catch any warning has been deprecated, pass no arguments instead:\n"
" Replace pytest.warns(None) by simply pytest.warns()."
) )
# You want to make some `__init__` or function "private". # You want to make some `__init__` or function "private".

5
testing/deprecated_test.py
View File

@ -183,6 +183,7 @@ def test_hookproxy_warnings_for_fspath(tmp_path, hooktype, request):
def test_warns_none_is_deprecated(): def test_warns_none_is_deprecated():
with pytest.warns( with pytest.warns(
PytestDeprecationWarning, PytestDeprecationWarning,
match="Please pass an explicit Warning type or tuple of Warning types.", match=r"Passing None to catch any warning has been deprecated, pass no arguments instead:\n Replace pytest.warns\(None\) by simply pytest.warns\(\).",
): ):
pytest.warns(None) with pytest.warns(None):
pass

1
testing/test_recwarn.py
View File

@ -307,6 +307,7 @@ class TestWarns:
assert str(record[1].message) == "runtime" assert str(record[1].message) == "runtime"
def test_record_only_none_deprecated_warn(self) -> None: def test_record_only_none_deprecated_warn(self) -> None:
# This should become an error when WARNS_NONE_ARG is removed in Pytest 7.0
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.simplefilter("ignore") warnings.simplefilter("ignore")
with pytest.warns(None) as record: with pytest.warns(None) as record: