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

Merge pull request #2475 from ant31/master 

[wip] Fix ignore_path condition
This commit is contained in:
Bruno Oliveira 2017-07-03 18:57:17 -03:00 committed by GitHub
parent 6e2b5a3f1b c578418791
commit 6908d93ba1
2 changed files with 3 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.

1
changelog/2475.bugfix Normal file
View File

@ -0,0 +1 @@
Fix issue where paths collected by pytest could have triple leading ``/`` characters.