Merge pull request #8367 from The-Compiler/class-fromparent-kw

3 files changed, 19 insertions, 2 deletions

diff --git a/changelog/8367.bugfix.rst b/changelog/8367.bugfix.rst
new file mode 100644
index 000000000..f4b036701
--- /dev/null
+++ b/changelog/8367.bugfix.rst
@@ -0,0 +1 @@
+Fix ``Class.from_parent`` so it forwards extra keyword arguments to the constructor.
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
index 726241cb5..944c395a8 100644
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -763,9 +763,9 @@ class Class(PyCollector):
     """Collector for test methods."""
 
     @classmethod
-    def from_parent(cls, parent, *, name, obj=None):
+    def from_parent(cls, parent, *, name, obj=None, **kw):
         """The public constructor."""
-        return super().from_parent(name=name, parent=parent)
+        return super().from_parent(name=name, parent=parent, **kw)
 
     def collect(self) -> Iterable[Union[nodes.Item, nodes.Collector]]:
         if not safe_getattr(self.obj, "__test__", True):
diff --git a/testing/test_collection.py b/testing/test_collection.py
index 3dd9283ec..298c2dde1 100644
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -1360,6 +1360,22 @@ def test_fscollector_from_parent(pytester: Pytester, request: FixtureRequest) ->
     assert collector.x == 10
 
 
+def test_class_from_parent(pytester: Pytester, request: FixtureRequest) -> None:
+    """Ensure Class.from_parent can forward custom arguments to the constructor."""
+
+    class MyCollector(pytest.Class):
+        def __init__(self, name, parent, x):
+            super().__init__(name, parent)
+            self.x = x
+
+        @classmethod
+        def from_parent(cls, parent, *, name, x):
+            return super().from_parent(parent=parent, name=name, x=x)
+
+    collector = MyCollector.from_parent(parent=request.session, name="foo", x=10)
+    assert collector.x == 10
+
+
 class TestImportModeImportlib:
     def test_collect_duplicate_names(self, pytester: Pytester) -> None:
         """--import-mode=importlib can import modules with same names that are not in packages."""