diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-09-26 21:05:53 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-09-27 22:22:57 -0400 |
| commit | 8690940976544f368dad31cfbc46d9e1426b2ce1 (patch) | |
| tree | 345bc5036efed496025f41ac822d6103c8136c63 /alembic/testing | |
| parent | bcc3c1ac3237970070cff26c48c1c28d5df33f27 (diff) | |
| download | alembic-8690940976544f368dad31cfbc46d9e1426b2ce1.tar.gz | |
Support pytest 6.x
pytest has removed support for pytest.Class(..parent)
and we need to use from_parent.
Also works around new issue for 6.1.0
References: https://github.com/pytest-dev/pytest/issues/7807
Change-Id: Ia5fed9b22e76c99f71489283acee207f996f52a4
Diffstat (limited to 'alembic/testing')
| -rw-r--r-- | alembic/testing/plugin/pytestplugin.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/alembic/testing/plugin/pytestplugin.py b/alembic/testing/plugin/pytestplugin.py index 1c8be05..ba3d35b 100644 --- a/alembic/testing/plugin/pytestplugin.py +++ b/alembic/testing/plugin/pytestplugin.py @@ -33,16 +33,10 @@ def pytest_configure(config): def pytest_pycollect_makeitem(collector, name, obj): if inspect.isclass(obj) and plugin_base.want_class(name, obj): - - # in pytest 5.4.0 - # return [ - # pytest.Class.from_parent(collector, - # name=parametrize_cls.__name__) - # for parametrize_cls in _parametrize_cls(collector.module, obj) - # ] + ctor = getattr(pytest.Class, "from_parent", pytest.Class) return [ - pytest.Class(parametrize_cls.__name__, parent=collector) + ctor(name=parametrize_cls.__name__, parent=collector) for parametrize_cls in _parametrize_cls(collector.module, obj) ] elif ( |