diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-03-17 22:19:17 +0100 |
|---|---|---|
| committer | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2018-03-29 17:52:01 +0200 |
| commit | 2d06ae0f65f88ca21d3f2ad8fe51286548dafab5 (patch) | |
| tree | 96cef20f1af1695e9afc9885e554f78d29788289 /_pytest | |
| parent | 99015bfc86d6ad309bdd9abbe2c0700d58ca36d1 (diff) | |
| download | pytest-2d06ae0f65f88ca21d3f2ad8fe51286548dafab5.tar.gz | |
base metafunc fixtureinfo on the functiondefinition to caputure its marks
Diffstat (limited to '_pytest')
| -rw-r--r-- | _pytest/python.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/_pytest/python.py b/_pytest/python.py index e33de018e..86c3be447 100644 --- a/_pytest/python.py +++ b/_pytest/python.py @@ -367,13 +367,14 @@ class PyCollector(PyobjMixin, nodes.Collector): cls = clscol and clscol.obj or None transfer_markers(funcobj, cls, module) fm = self.session._fixturemanager - fixtureinfo = fm.getfixtureinfo(self, funcobj, cls) definition = FunctionDefinition( name=name, parent=self, callobj=funcobj, ) + fixtureinfo = fm.getfixtureinfo(definition, funcobj, cls) + metafunc = Metafunc(definition, fixtureinfo, self.config, cls=cls, module=module) methods = [] if hasattr(module, "pytest_generate_tests"): |