p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarified `markers` ini property. Fix #11738 (#11739)

This commit is contained in:
Marc Bresson 2024-01-03 13:20:54 +01:00 committed by GitHub
parent 2c5c97b6d1
commit effc2b0529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -242,6 +242,7 @@ Marc Mueller
Marc Schlaich Marc Schlaich
Marcelo Duarte Trevisani Marcelo Duarte Trevisani
Marcin Bachry Marcin Bachry
Marc Bresson
Marco Gorelli Marco Gorelli
Mark Abramowitz Mark Abramowitz
Mark Dickinson Mark Dickinson

2
doc/en/reference/reference.rst
View File

@ -2100,7 +2100,7 @@ All the command-line flags can be obtained by running ``pytest --help``::
[pytest] ini-options in the first pytest.ini|tox.ini|setup.cfg|pyproject.toml file found: [pytest] ini-options in the first pytest.ini|tox.ini|setup.cfg|pyproject.toml file found:
markers (linelist): Markers for test functions markers (linelist): Register new markers for test functions
empty_parameter_set_mark (string): empty_parameter_set_mark (string):
Default marker for empty parametersets Default marker for empty parametersets
norecursedirs (args): Directory patterns to avoid for recursion norecursedirs (args): Directory patterns to avoid for recursion

2
src/_pytest/mark/__init__.py
View File

@ -105,7 +105,7 @@ def pytest_addoption(parser: Parser) -> None:
help="show markers (builtin, plugin and per-project ones).", help="show markers (builtin, plugin and per-project ones).",
) )
parser.addini("markers", "Markers for test functions", "linelist") parser.addini("markers", "Register new markers for test functions", "linelist")
parser.addini(EMPTY_PARAMETERSET_OPTION, "Default marker for empty parametersets") parser.addini(EMPTY_PARAMETERSET_OPTION, "Default marker for empty parametersets")