diff --git a/conftest.py b/conftest.py index 0939bcfe..b06379a2 100644 --- a/conftest.py +++ b/conftest.py @@ -106,13 +106,10 @@ def pytest_collection_modifyitems(session, config, items): assert isinstance(item, _pytest.python.Function) # unittest-style test functions have the node of UnitTest class as parent - assert isinstance( - item.parent, - ( - _pytest.python.Class, # pytest >= 7.0.0 - _pytest.python.Instance, # pytest < 7.0.0 - ), - ) + if tuple(map(int, _pytest.__version__.split("."))) >= (7,): + assert isinstance(item.parent, _pytest.python.Class) + else: + assert isinstance(item.parent, _pytest.python.Instance) # and that node references the UnitTest class assert issubclass(item.parent.cls, _IrcTestCase)