Merge branch 'master' into features

2017-07-04 12:44:58 -03:00
parent 0303d95a53 b63f6770a1
commit b62aef3372
22 changed files with 134 additions and 75 deletions
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -168,14 +168,13 @@ def pytest_runtestloop(session):


 def pytest_ignore_collect(path, config):
-    p = path.dirpath()
-    ignore_paths = config._getconftest_pathlist("collect_ignore", path=p)
+    ignore_paths = config._getconftest_pathlist("collect_ignore", path=path.dirpath())
    ignore_paths = ignore_paths or []
    excludeopt = config.getoption("ignore")
    if 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

    # Skip duplicate paths.