Merge remote-tracking branch 'origin/master' into mm

This commit is contained in:
Anthony Sottile
2019-11-15 15:26:57 -08:00
16 changed files with 143 additions and 28 deletions

View File

@@ -966,6 +966,12 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
)
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)