summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2021-02-23 16:25:14 -0300
committerGitHub <noreply@github.com>2021-02-23 16:25:14 -0300
commitbbea18d7f9738caa0ef21727137f85b7494c9518 (patch)
tree5ef1e23461a9d937ee45e464a1f5fb6e2370eba0 /src
parent690fb26ec7e40ede373fe1729bdd9523b49ca040 (diff)
parent3b7fc2c9c839148d19518af655a1d347351286b0 (diff)
downloadpytest-bbea18d7f9738caa0ef21727137f85b7494c9518.tar.gz
Merge pull request #8367 from The-Compiler/class-fromparent-kw
Diffstat (limited to 'src')
-rw-r--r--src/_pytest/python.py4
1 files changed, 2 insertions, 2 deletions
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):