jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7253 from bluetech/fixture-special-case 

fixtures: remove special cases when deciding when pytest.fixture() is a direct decoration
This commit is contained in:
Ran Benita 2020-06-05 11:33:43 +03:00 committed by GitHub
parent 4c2703bccb 5507752c53
commit e7c26a92d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/7253.bugfix.rst Normal file
View File

@ -0,0 +1,3 @@
When using ``pytest.fixture`` on a function directly, as in ``pytest.fixture(func)``,
if the ``autouse`` or ``params`` arguments are also passed, the function is no longer
ignored, but is marked as a fixture.

12
src/_pytest/fixtures.py
View File

@ -1152,13 +1152,15 @@ def fixture(
if params is not None: if params is not None:
params = list(params) params = list(params)
if fixture_function and params is None and autouse is False: fixture_marker = FixtureFunctionMarker(
# direct decoration scope=scope, params=params, autouse=autouse, ids=ids, name=name,
return FixtureFunctionMarker(scope, params, autouse, name=name)(
fixture_function
) )
return FixtureFunctionMarker(scope, params, autouse, ids=ids, name=name) # Direct decoration.
if fixture_function:
return fixture_marker(fixture_function)
return fixture_marker
def yield_fixture( def yield_fixture(