Merge branch 'master' into then-when-target-fixture

This commit is contained in:
Alessio Bogon 2021-07-03 10:16:59 +02:00 committed by GitHub
commit f172bd6fe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -2,18 +2,18 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/psf/black
rev: 21.4b0
rev: 21.6b0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.0.1
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/asottile/pyupgrade
rev: v2.13.0
rev: v2.19.4
hooks:
- id: pyupgrade
args: [--py36-plus]

View File

@ -163,7 +163,7 @@ def _get_scenario_decorator(feature, feature_name, scenario, scenario_name):
@pytest.mark.usefixtures(*function_args)
def scenario_wrapper(request):
_execute_scenario(feature, scenario, request)
return fn(*[request.getfixturevalue(arg) for arg in args])
return fn(*(request.getfixturevalue(arg) for arg in args))
for param_set in scenario.get_params():
if param_set: