Merge pull request #7143 from nicoddemus/file-from-parent

Author: nicoddemus

changelog/7143.bugfix.rst

@@ -0,0 +1 @@
+Fix ``File.from_constructor`` so it forwards extra keyword arguments to the constructor.

src/_pytest/nodes.py

@@ -483,11 +483,11 @@ def __init__(
         self._norecursepatterns = self.config.getini("norecursedirs")
 
     @classmethod
-    def from_parent(cls, parent, *, fspath):
+    def from_parent(cls, parent, *, fspath, **kw):
         """
         The public constructor
         """
-        return super().from_parent(parent=parent, fspath=fspath)
+        return super().from_parent(parent=parent, fspath=fspath, **kw)
 
     def _gethookproxy(self, fspath: py.path.local):
         # check if we have the common case of running

testing/test_collection.py

@@ -1332,3 +1332,24 @@ def test_does_not_put_src_on_path(testdir):
     )
     result = testdir.runpytest()
     assert result.ret == ExitCode.OK
+
+
+def test_fscollector_from_parent(tmpdir, request):
+    """Ensure File.from_parent can forward custom arguments to the constructor.
+
+    Context: https://github.com/pytest-dev/pytest-cpp/pull/47
+    """
+
+    class MyCollector(pytest.File):
+        def __init__(self, fspath, parent, x):
+            super().__init__(fspath, parent)
+            self.x = x
+
+        @classmethod
+        def from_parent(cls, parent, *, fspath, x):
+            return super().from_parent(parent=parent, fspath=fspath, x=x)
+
+    collector = MyCollector.from_parent(
+        parent=request.session, fspath=tmpdir / "foo", x=10
+    )
+    assert collector.x == 10