Better the fix for pytest-dev#3742.

jonozzz · Aug 10, 2018 · 417c742 · 417c742
1 parent d0bd01b
commit 417c742
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/_pytest/main.py b/src/_pytest/main.py
@@ -505,8 +505,9 @@ def _collect(self, arg):
                             root = self._node_cache[pkginit]
                         else:
                             col = root._collectfile(pkginit)
-                            if col and isinstance(col, Package):
-                                root = col[0]
+                            if col:
+                                if isinstance(col[0], Package):
+                                    root = col[0]
                                 self._node_cache[root.fspath] = root
 
         # If it's a directory argument, recurse and look for any Subpackages.

diff --git a/testing/test_collection.py b/testing/test_collection.py
@@ -647,7 +647,7 @@ def test_pkgfile(self, testdir):
         col = testdir.getnode(config, x)
         assert isinstance(col, pytest.Module)
         assert col.name == "x.py"
-        assert col.parent.parent is None
+        assert col.parent.parent.parent is None
         for col in col.listchain():
             assert col.config is config