p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r63046] change a few comments 

--HG--
branch : trunk
This commit is contained in:
hpk 2009-03-18 17:25:58 +01:00
parent 941d06e509
commit b7e47d0e3c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/test/plugin/pytest_default.py
View File

@ -16,15 +16,18 @@ class DefaultPlugin:
return parent.Module(path, parent=parent) return parent.Module(path, parent=parent)
def pytest_collect_directory(self, path, parent): def pytest_collect_directory(self, path, parent):
#excludelist = parent._config.getvalue_pathlist('dir_exclude', path)
#if excludelist and path in excludelist:
# return
if not parent.recfilter(path): if not parent.recfilter(path):
# check if cmdline specified this dir or a subdir # check if cmdline specified this dir or a subdir directly
for arg in parent.config.args: for arg in parent.config.args:
if path == arg or arg.relto(path): if path == arg or arg.relto(path):
break break
else: else:
return return
# not use parent.Directory here as we want # not use parent.Directory here as we generally
# dir/conftest.py to be able to # want dir/conftest.py to be able to
# define Directory(dir) already # define Directory(dir) already
Directory = parent.config.getvalue('Directory', path) Directory = parent.config.getvalue('Directory', path)
return Directory(path, parent=parent) return Directory(path, parent=parent)