Merge remote-tracking branch 'upstream/master' into mm

Conflicts: src/_pytest/main.py src/_pytest/mark/structures.py src/_pytest/python.py testing/test_main.py testing/test_parseopt.py
2020-02-11 10:32:18 -03:00
parent 7484e346f9 0ee007ca33
commit 78baa7b575
31 changed files with 161 additions and 138 deletions
@@ -901,8 +901,8 @@ Can be either a ``str`` or ``Sequence[str]``.
    pytest_plugins = ("myapp.testsupport.tools", "myapp.testsupport.regression")


-pytest_mark
-~~~~~~~~~~~
+pytestmark
+~~~~~~~~~~

 **Tutorial**: :ref:`scoped-marking`