Skip to content

Commit

Permalink
Fixing missing marks when inheritance from multiple classes
Browse files Browse the repository at this point in the history
  • Loading branch information
Oren Efraimov committed Sep 19, 2021
1 parent 60e995d commit ec295cc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/_pytest/python.py
Original file line number Diff line number Diff line change
Expand Up @@ -1587,6 +1587,8 @@ def __init__(

self.keywords.update(self.obj.__dict__)
self.own_markers.extend(get_unpacked_marks(self.obj))
self.own_markers.extend(
{str(mark): mark for parent_obj in self.cls.__mro__ for mark in get_unpacked_marks(parent_obj)}.values())
if callspec:
self.callspec = callspec
# this is total hostile and a mess
Expand Down

0 comments on commit ec295cc

Please sign in to comment.