From d550c33cd02512fd78a9a6b0e205dbbaf4f5e9d1 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Fri, 26 Jan 2018 11:56:24 +0100 Subject: [PATCH] s/empty_parameterset/empty_parameter_set_mark --- _pytest/mark.py | 4 ++-- doc/en/customize.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_pytest/mark.py b/_pytest/mark.py index 24bb55838..c3352b387 100644 --- a/_pytest/mark.py +++ b/_pytest/mark.py @@ -95,7 +95,7 @@ class ParameterSet(namedtuple('ParameterSet', 'values, marks, id')): 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'): mark = MARK_GEN.skip elif requested_mark == 'xfail': @@ -148,7 +148,7 @@ def pytest_addoption(parser): parser.addini("markers", "markers for test functions", 'linelist') parser.addini( - "empty_parameterset", + "empty_parameter_set_mark", "default marker for empty parametersets") diff --git a/doc/en/customize.rst b/doc/en/customize.rst index bbff9d189..eb79ba668 100644 --- a/doc/en/customize.rst +++ b/doc/en/customize.rst @@ -348,7 +348,7 @@ passed multiple times. The expected format is ``name=value``. For example:: console_output_style = classic -.. confval:: empty_parameterset +.. confval:: empty_parameter_set_mark .. versionadded:: 3.4 @@ -363,4 +363,4 @@ passed multiple times. The expected format is ``name=value``. For example:: # content of pytest.ini [pytest] - empty_parameterset = xfail \ No newline at end of file + empty_parameter_set_mark = xfail \ No newline at end of file