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

s/empty_parameterset/empty_parameter_set_mark

This commit is contained in:
Ronny Pfannschmidt 2018-01-26 11:56:24 +01:00
parent 8979b2a9d7
commit d550c33cd0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/mark.py
View File

@ -95,7 +95,7 @@ class ParameterSet(namedtuple('ParameterSet', 'values, marks, id')):
def get_empty_parameterset_mark(config, argnames, function): def get_empty_parameterset_mark(config, argnames, function):
requested_mark = config.getini('empty_parameterset') requested_mark = config.getini('empty_parameter_set_mark')
if requested_mark in ('', None, 'skip'): if requested_mark in ('', None, 'skip'):
mark = MARK_GEN.skip mark = MARK_GEN.skip
elif requested_mark == 'xfail': elif requested_mark == 'xfail':
@ -148,7 +148,7 @@ def pytest_addoption(parser):
parser.addini("markers", "markers for test functions", 'linelist') parser.addini("markers", "markers for test functions", 'linelist')
parser.addini( parser.addini(
"empty_parameterset", "empty_parameter_set_mark",
"default marker for empty parametersets") "default marker for empty parametersets")

4
doc/en/customize.rst
View File

@ -348,7 +348,7 @@ passed multiple times. The expected format is ``name=value``. For example::
console_output_style = classic console_output_style = classic
.. confval:: empty_parameterset .. confval:: empty_parameter_set_mark
.. versionadded:: 3.4 .. versionadded:: 3.4
@ -363,4 +363,4 @@ passed multiple times. The expected format is ``name=value``. For example::
# content of pytest.ini # content of pytest.ini
[pytest] [pytest]
empty_parameterset = xfail empty_parameter_set_mark = xfail