Merge pull request #6201 from asottile/mm

Merge master into features
This commit is contained in:
Anthony Sottile
2019-11-17 11:30:51 -08:00
committed by GitHub
16 changed files with 143 additions and 28 deletions

View File

@@ -973,6 +973,12 @@ class Metafunc:
)
del argvalues
if "request" in argnames:
fail(
"'request' is a reserved name and cannot be used in @pytest.mark.parametrize",
pytrace=False,
)
if scope is None:
scope = _find_parametrized_scope(argnames, self._arg2fixturedefs, indirect)