floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Type annotate more of _pytest.nodes

Browse Source
This commit is contained in:
Ran Benita
2020-05-01 14:40:16 +03:00
parent 32dd0e87cb
commit fc325bc0c3
3 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/python.py
View File

@@ -423,7 +423,9 @@ class PyCollector(PyobjMixin, nodes.Collector):
return item
def _genfunctions(self, name, funcobj):
module = self.getparent(Module).obj
modulecol = self.getparent(Module)
assert modulecol is not None
module = modulecol.obj
clscol = self.getparent(Class)
cls = clscol and clscol.obj or None
fm = self.session._fixturemanager
@@ -437,7 +439,7 @@ class PyCollector(PyobjMixin, nodes.Collector):
methods = []
if hasattr(module, "pytest_generate_tests"):
methods.append(module.pytest_generate_tests)
if hasattr(cls, "pytest_generate_tests"):
if cls is not None and hasattr(cls, "pytest_generate_tests"):
methods.append(cls().pytest_generate_tests)
self.ihook.pytest_generate_tests.call_extra(methods, dict(metafunc=metafunc))