diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2020-08-21 21:39:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-08-21 21:39:40 +0000 |
| commit | 317f2e1be2b06cdc12bc84510eb743d9752763dd (patch) | |
| tree | acf50269494e5a14ec58ef87e511a8a93f1b263d /lib/sqlalchemy/testing/plugin/pytestplugin.py | |
| parent | 9b6b867fe59d74c23edca782dcbba9af99b62817 (diff) | |
| parent | 26e8d3b5bdee50192e3426fba48e6b326e428e0b (diff) | |
| download | sqlalchemy-317f2e1be2b06cdc12bc84510eb743d9752763dd.tar.gz | |
Merge "Add support for identity columns"
Diffstat (limited to 'lib/sqlalchemy/testing/plugin/pytestplugin.py')
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/pytestplugin.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py index 1b2bbca23..ca3fbe4a8 100644 --- a/lib/sqlalchemy/testing/plugin/pytestplugin.py +++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py @@ -242,15 +242,10 @@ 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 ( |