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

Fixed the fixture function signature.

This commit is contained in:
Andrzej Klajnert 2019-09-10 16:20:44 +02:00
parent 10bf6aac76
commit f2f3ced508
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/_pytest/fixtures.py
View File

@ -1012,7 +1012,16 @@ FIXTURE_ARGS_ORDER = ("scope", "params", "autouse", "ids", "name")
def _parse_fixture_args(callable_or_scope, *args, **kwargs): def _parse_fixture_args(callable_or_scope, *args, **kwargs):
arguments = dict(scope="function", params=None, autouse=False, ids=None, name=None) arguments = {
"scope": "function",
"params": None,
"autouse": False,
"ids": None,
"name": None,
}
kwargs = {
key: value for key, value in kwargs.items() if arguments.get(key) != value
}
fixture_function = None fixture_function = None
if isinstance(callable_or_scope, str): if isinstance(callable_or_scope, str):
@ -1041,7 +1050,15 @@ def _parse_fixture_args(callable_or_scope, *args, **kwargs):
return fixture_function, arguments return fixture_function, arguments
def fixture(callable_or_scope=None, *args, **kwargs): def fixture(
callable_or_scope=None,
*args,
scope="function",
params=None,
autouse=False,
ids=None,
name=None
):
"""Decorator to mark a fixture factory function. """Decorator to mark a fixture factory function.
This decorator can be used, with or without parameters, to define a This decorator can be used, with or without parameters, to define a
@ -1088,7 +1105,13 @@ def fixture(callable_or_scope=None, *args, **kwargs):
``@pytest.fixture(name='<fixturename>')``. ``@pytest.fixture(name='<fixturename>')``.
""" """
fixture_function, arguments = _parse_fixture_args( fixture_function, arguments = _parse_fixture_args(
callable_or_scope, *args, **kwargs callable_or_scope,
*args,
scope=scope,
params=params,
autouse=autouse,
ids=ids,
name=name
) )
scope = arguments.get("scope") scope = arguments.get("scope")
params = arguments.get("params") params = arguments.get("params")
@ -1107,13 +1130,29 @@ def fixture(callable_or_scope=None, *args, **kwargs):
return FixtureFunctionMarker(scope, params, autouse, ids=ids, name=name) return FixtureFunctionMarker(scope, params, autouse, ids=ids, name=name)
def yield_fixture(callable_or_scope=None, *args, **kwargs): def yield_fixture(
callable_or_scope=None,
*args,
scope="function",
params=None,
autouse=False,
ids=None,
name=None
):
""" (return a) decorator to mark a yield-fixture factory function. """ (return a) decorator to mark a yield-fixture factory function.
.. deprecated:: 3.0 .. deprecated:: 3.0
Use :py:func:`pytest.fixture` directly instead. Use :py:func:`pytest.fixture` directly instead.
""" """
return fixture(callable_or_scope=callable_or_scope, *args, **kwargs) return fixture(
callable_or_scope,
*args,
scope=scope,
params=params,
autouse=autouse,
ids=ids,
name=name
)
defaultfuncargprefixmarker = fixture() defaultfuncargprefixmarker = fixture()