jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify pluginlist computation

This commit is contained in:
holger krekel 2010-11-24 22:22:52 +01:00
parent 4cb2c74159
commit ab08cb2176
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
_pytest/python.py
View File

@ -208,7 +208,10 @@ class PyCollectorMixin(PyobjMixin, pytest.Collector):
metafunc = Metafunc(funcobj, config=self.config, metafunc = Metafunc(funcobj, config=self.config,
cls=cls, module=module) cls=cls, module=module)
gentesthook = self.config.hook.pytest_generate_tests gentesthook = self.config.hook.pytest_generate_tests
plugins = getplugins(self, withpy=True) extra = [module]
if cls is not None:
extra.append(cls())
plugins = self.getplugins() + extra
gentesthook.pcall(plugins, metafunc=metafunc) gentesthook.pcall(plugins, metafunc=metafunc)
if not metafunc._calls: if not metafunc._calls:
return Function(name, parent=self) return Function(name, parent=self)
@ -497,17 +500,6 @@ def fillfuncargs(function):
request = FuncargRequest(pyfuncitem=function) request = FuncargRequest(pyfuncitem=function)
request._fillfuncargs() request._fillfuncargs()
def getplugins(node, withpy=False): # might by any node
plugins = node.config._getmatchingplugins(node.fspath)
if withpy:
mod = node.getparent(pytest.Module)
if mod is not None:
plugins.append(mod.obj)
inst = node.getparent(pytest.Instance)
if inst is not None:
plugins.append(inst.obj)
return plugins
_notexists = object() _notexists = object()
class CallSpec: class CallSpec:
def __init__(self, funcargs, id, param): def __init__(self, funcargs, id, param):
@ -572,7 +564,8 @@ class FuncargRequest:
self._pyfuncitem = pyfuncitem self._pyfuncitem = pyfuncitem
if hasattr(pyfuncitem, '_requestparam'): if hasattr(pyfuncitem, '_requestparam'):
self.param = pyfuncitem._requestparam self.param = pyfuncitem._requestparam
self._plugins = getplugins(pyfuncitem, withpy=True) extra = filter(None, [self.module, self.instance])
self._plugins = pyfuncitem.getplugins() + extra
self._funcargs = self._pyfuncitem.funcargs.copy() self._funcargs = self._pyfuncitem.funcargs.copy()
self._name2factory = {} self._name2factory = {}
self._currentarg = None self._currentarg = None
@ -741,9 +734,9 @@ def showfuncargs(config):
session = Session(config) session = Session(config)
session.perform_collect() session.perform_collect()
if session.items: if session.items:
plugins = getplugins(session.items[0]) plugins = session.items[0].getplugins()
else: else:
plugins = getplugins(session) plugins = session.getplugins()
curdir = py.path.local() curdir = py.path.local()
tw = py.io.TerminalWriter() tw = py.io.TerminalWriter()
verbose = config.getvalue("verbose") verbose = config.getvalue("verbose")

3
_pytest/session.py
View File

@ -221,6 +221,9 @@ class Node(object):
def listnames(self): def listnames(self):
return [x.name for x in self.listchain()] return [x.name for x in self.listchain()]
def getplugins(self):
return self.config._getmatchingplugins(self.fspath)
def getparent(self, cls): def getparent(self, cls):
current = self current = self
while current and not isinstance(current, cls): while current and not isinstance(current, cls):