forked from pool/python-pytest-relaxed
b2b7e12aed
* Support pytest > 6.1 - No longer skip python310. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-relaxed?expand=0&rev=14
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
Index: pytest-relaxed-1.1.5/pytest_relaxed/classes.py
|
|
===================================================================
|
|
--- pytest-relaxed-1.1.5.orig/pytest_relaxed/classes.py
|
|
+++ pytest-relaxed-1.1.5/pytest_relaxed/classes.py
|
|
@@ -179,23 +179,15 @@ class SpecInstance(RelaxedMixin, Instanc
|
|
setattr(obj, name, value)
|
|
return obj
|
|
|
|
- # Stub for pytest >=3.0,<3.3 where _makeitem did not exist
|
|
- def makeitem(self, *args, **kwargs):
|
|
- return self._makeitem(*args, **kwargs)
|
|
-
|
|
- def _makeitem(self, name, obj):
|
|
- # More pytestmark skipping.
|
|
- if name == "pytestmark":
|
|
- return
|
|
- # NOTE: no need to modify collect() this time, just mutate item
|
|
- # creation. TODO: but if collect() is still public, let's move to that
|
|
- # sometime, if that'll work as well.
|
|
- superb = super(SpecInstance, self)
|
|
- attr = "_makeitem" if hasattr(superb, "_makeitem") else "makeitem"
|
|
- item = getattr(superb, attr)(name, obj)
|
|
- # Replace any Class objects with SpecClass; this will automatically
|
|
- # recurse.
|
|
- # TODO: can we unify this with SpecModule's same bits?
|
|
- if isinstance(item, Class):
|
|
- item = SpecClass.from_parent(item.parent, name=item.name)
|
|
- return item
|
|
+ def collect(self):
|
|
+ items = super(SpecInstance, self).collect()
|
|
+ collected = []
|
|
+ for item in items:
|
|
+ # Replace any Class objects with SpecClass, and recurse into it.
|
|
+ if isinstance(item, Class):
|
|
+ cls = SpecClass.from_parent(item.parent, name=item.name)
|
|
+ for item in cls.collect():
|
|
+ collected.append(item)
|
|
+ else:
|
|
+ collected.append(item)
|
|
+ return collected
|