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

rename hook, rename addfuncarg to addcall interface,

Browse Source 
forget about combinations of funcargs.

--HG--
branch : trunk
This commit is contained in:
holger krekel
2009-05-12 01:38:09 +02:00
parent d9ad2cf761
commit c3f3dc653e
5 changed files with 101 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
py/test/pycollect.py
+5 -5
View File
@@ -172,13 +172,13 @@ class PyCollectorMixin(PyobjMixin, py.test.collect.Collector):
# to work to get at the class
clscol = self.getclasscollector()
cls = clscol and clscol.obj or None
runspec = funcargs.RunSpecs(funcobj, config=self.config, cls=cls, module=module)
gentesthook = self.config.hook.pytest_genfuncruns.clone(extralookup=module)
gentesthook(runspec=runspec)
if not runspec._combinations:
funcspec = funcargs.FuncSpecs(funcobj, config=self.config, cls=cls, module=module)
gentesthook = self.config.hook.pytest_genfunc.clone(extralookup=module)
gentesthook(funcspec=funcspec)
if not funcspec._calls:
return self.Function(name, parent=self)
return funcargs.FunctionCollector(name=name,
parent=self, combinations=runspec._combinations)
parent=self, combinations=funcspec._calls)
class Module(py.test.collect.File, PyCollectorMixin):
def _getobj(self):