Fix recursion bug if a pytest_ignore_collect returns False instead of None

nicoddemus · nicoddemus · commit fe0a76e1a61f · 2018-08-03T15:40:33.000-03:00
diff --git a/changelog/3771.bugfix.rst b/changelog/3771.bugfix.rst
@@ -0,0 +1 @@
+Fix infinite recursion during collection if a ``pytest_ignore_collect`` returns ``False`` instead of ``None``.
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
@@ -561,7 +561,7 @@ def __init__(self, fspath, parent=None, config=None, session=None, nodeid=None):
     def _recurse(self, path):
         ihook = self.gethookproxy(path.dirpath())
         if ihook.pytest_ignore_collect(path=path, config=self.config):
-            return
+            return False
         for pat in self._norecursepatterns:
             if path.check(fnmatch=pat):
                 return False
@@ -594,9 +594,12 @@ def isinitpath(self, path):
         return path in self.session._initialpaths
 
     def collect(self):
-        path = self.fspath.dirpath()
+        this_path = self.fspath.dirpath()
         pkg_prefix = None
-        for path in path.visit(fil=lambda x: 1, rec=self._recurse, bf=True, sort=True):
+        for path in this_path.visit(rec=self._recurse, bf=True, sort=True):
+            # we will visit our own __init__.py file, in which case we skip it
+            if path.basename == "__init__.py" and path.dirpath() == this_path:
+                continue
             if pkg_prefix and pkg_prefix in path.parts():
                 continue
             for x in self._collectfile(path):

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix infinite recursion during collection if a ``pytest_ignore_collect`` returns ``False`` instead of ``None``.