Merge remote-tracking branch 'allanlewis/fix-unknown-mark-warning-sta…

…ck-level' into acceptance-tests_pytest-dev/pytest/pytest-dev#4445
phloose · Oct 29, 2019 · 83f42fa · 83f42fa
2 parents c489af3 + 03dc5ae
commit 83f42fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/changelog/5928.bugfix.rst b/changelog/5928.bugfix.rst
@@ -0,0 +1 @@
+Report ``PytestUnknownMarkWarning`` at the level of the user's code, not ``pytest``'s.
diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py
@@ -323,6 +323,7 @@ def __getattr__(self, name: str) -> MarkDecorator:
                         "custom marks to avoid this warning - for details, see "
                         "https://docs.pytest.org/en/latest/mark.html" % name,
                         PytestUnknownMarkWarning,
+                        2,
                     )
 
         return MarkDecorator(Mark(name, (), {}))