From 055631d7f7ab10ee1641a604f178d4d865e61221 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 23 Oct 2014 11:25:51 -0700 Subject: Fix to handle multiple instances of @pytest.mark_requires_backend_interface --- tests/conftest.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 7f8e71d5..31cdb634 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,13 +33,16 @@ def pytest_runtest_setup(item): required = item.keywords.get("requires_backend_interface") if ( required is not None and - "backend" in item.funcargs and - not isinstance(item.funcargs["backend"], required.kwargs['interface']) + "backend" in item.funcargs ): - pytest.skip("{0} backend does not support {1}".format( - item.funcargs["backend"], - required.kwargs['interface'].__name__ - )) + required_interfaces = tuple( + kwargs["interface"] for args, kwargs in required._arglist + ) + if not isinstance(item.funcargs["backend"], required_interfaces): + pytest.skip("{0} backend does not support {1}".format( + item.funcargs["backend"], + ", ".join(iface.__name__ for iface in required_interfaces) + )) check_backend_support(item) -- cgit v1.2.3