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

_getconftestmodules: optimize

This commit is contained in:
Daniel Hahler 2018-10-10 15:32:19 +02:00
parent b8958168f5
commit 52ff1eaf37
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/_pytest/config/__init__.py
View File

@ -378,17 +378,19 @@ class PytestPluginManager(PluginManager):
def _getconftestmodules(self, path):
if self._noconftest:
return []
try:
return self._path2confmods[path]
except KeyError:
if path.isfile():
clist = self._getconftestmodules(path.dirpath())
directory = path.dirpath()
else:
directory = path
try:
return self._path2confmods[directory]
except KeyError:
# XXX these days we may rather want to use config.rootdir
# and allow users to opt into looking into the rootdir parent
# directories instead of requiring to specify confcutdir
clist = []
for parent in path.parts():
for parent in directory.parts():
if self._confcutdir and self._confcutdir.relto(parent):
continue
conftestpath = parent.join("conftest.py")
@ -396,7 +398,7 @@ class PytestPluginManager(PluginManager):
mod = self._importconftest(conftestpath)
clist.append(mod)
self._path2confmods[path] = clist
self._path2confmods[directory] = clist
return clist
def _rget_with_confmod(self, name, path):