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

ENH: Improve warning stacklevel

This commit is contained in:
Eric Larson 2024-02-20 11:49:13 -05:00
parent 95f21f96cc
commit 715dbc0f6c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/mark/structures.py
View File

@ -355,7 +355,7 @@ class MarkDecorator:
func = args[0] func = args[0]
is_class = inspect.isclass(func) is_class = inspect.isclass(func)
if len(args) == 1 and (istestfunc(func) or is_class): if len(args) == 1 and (istestfunc(func) or is_class):
store_mark(func, self.mark) store_mark(func, self.mark, stacklevel=3)
return func return func
return self.with_args(*args, **kwargs) return self.with_args(*args, **kwargs)
@ -410,7 +410,7 @@ def normalize_mark_list(
yield mark_obj yield mark_obj
def store_mark(obj, mark: Mark) -> None: def store_mark(obj, mark: Mark, *, stacklevel: int=2) -> None:
"""Store a Mark on an object. """Store a Mark on an object.
This is used to implement the Mark declarations/decorators correctly. This is used to implement the Mark declarations/decorators correctly.
@ -420,7 +420,7 @@ def store_mark(obj, mark: Mark) -> None:
from ..fixtures import getfixturemarker from ..fixtures import getfixturemarker
if getfixturemarker(obj) is not None: if getfixturemarker(obj) is not None:
warnings.warn(MARKED_FIXTURE, stacklevel=2) warnings.warn(MARKED_FIXTURE, stacklevel=stacklevel)
# Always reassign name to avoid updating pytestmark in a reference that # Always reassign name to avoid updating pytestmark in a reference that
# was only borrowed. # was only borrowed.