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

Fix exclude_path check

This commit is contained in:
Antoine Legrand 2017-06-06 04:21:29 +02:00
parent 5ee9793c99
commit 16df4da1f7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_pytest/main.py
View File

@ -168,14 +168,13 @@ def pytest_runtestloop(session):
def pytest_ignore_collect(path, config): def pytest_ignore_collect(path, config):
p = path.dirpath() ignore_paths = config._getconftest_pathlist("collect_ignore", path=path.dirpath())
ignore_paths = config._getconftest_pathlist("collect_ignore", path=p)
ignore_paths = ignore_paths or [] ignore_paths = ignore_paths or []
excludeopt = config.getoption("ignore") excludeopt = config.getoption("ignore")
if excludeopt: if excludeopt:
ignore_paths.extend([py.path.local(x) for x in excludeopt]) ignore_paths.extend([py.path.local(x) for x in excludeopt])
if path in ignore_paths: if py.path.local(path) in ignore_paths:
return True return True
# Skip duplicate paths. # Skip duplicate paths.