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

modify detection of factories located in plugins, allowing pytest's own test functions to access plugin defined funcargs even if they use internal machinery instead of a full test run

This commit is contained in:
holger krekel 2012-09-12 12:51:45 +02:00
parent bfaf8e50b6
commit 084c617b67
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_pytest/python.py
View File

@ -1235,14 +1235,17 @@ class FuncargManager:
self.session = session self.session = session
self.config = session.config self.config = session.config
self.arg2facspec = {} self.arg2facspec = {}
session.config.pluginmanager.register(self, "funcmanage") self._seenplugins = set()
self._holderobjseen = set() self._holderobjseen = set()
self.setuplist = [] self.setuplist = []
self._arg2finish = {} self._arg2finish = {}
session.config.pluginmanager.register(self, "funcmanage")
### XXX this hook should be called for historic events like pytest_configure ### XXX this hook should be called for historic events like pytest_configure
### so that we don't have to do the below pytest_collection hook ### so that we don't have to do the below pytest_configure hook
def pytest_plugin_registered(self, plugin): def pytest_plugin_registered(self, plugin):
if plugin in self._seenplugins:
return
#print "plugin_registered", plugin #print "plugin_registered", plugin
nodeid = "" nodeid = ""
try: try:
@ -1253,10 +1256,11 @@ class FuncargManager:
if p.basename.startswith("conftest.py"): if p.basename.startswith("conftest.py"):
nodeid = p.dirpath().relto(self.session.fspath) nodeid = p.dirpath().relto(self.session.fspath)
self._parsefactories(plugin, nodeid) self._parsefactories(plugin, nodeid)
self._seenplugins.add(plugin)
@pytest.mark.tryfirst @pytest.mark.tryfirst
def pytest_collection(self, session): def pytest_configure(self, config):
plugins = session.config.pluginmanager.getplugins() plugins = config.pluginmanager.getplugins()
for plugin in plugins: for plugin in plugins:
self.pytest_plugin_registered(plugin) self.pytest_plugin_registered(plugin)