From f93d8244eac195fcc7577ddf22887052c2b686ab Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 23 Oct 2014 12:07:20 -0700 Subject: filter backends during initial generation to elide tests entirely --- tests/conftest.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 20926024..a2650850 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -25,22 +25,31 @@ def pytest_generate_tests(metafunc): selected_backends = select_backends(names, _available_backends()) if "backend" in metafunc.fixturenames: - metafunc.parametrize("backend", selected_backends) + filtered_backends = [] + for backend in selected_backends: + try: + required = metafunc.function.requires_backend_interface + required_interfaces = tuple( + mark.kwargs["interface"] for mark in required + ) + if isinstance(backend, required_interfaces): + filtered_backends.append(backend) + except AttributeError: + # function does not have requires_backend_interface decorator + filtered_backends.append(backend) + + if not filtered_backends: + pytest.skip( + "No backends provided supply the interface: {0}".format( + ", ".join(iface.__name__ for iface in required_interfaces) + ) + ) + else: + metafunc.parametrize("backend", filtered_backends) @pytest.mark.trylast def pytest_runtest_setup(item): - required = item.keywords.get("requires_backend_interface") - if required is not None and "backend" in item.funcargs: - required_interfaces = tuple( - mark.kwargs["interface"] for mark in required - ) - 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 From daefd3fbff9b83b1d714e93e46abcdc152873b80 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 24 Oct 2014 07:48:37 -0700 Subject: reorganize try block for test generation --- tests/conftest.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index a2650850..fd618039 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -29,14 +29,15 @@ def pytest_generate_tests(metafunc): for backend in selected_backends: try: required = metafunc.function.requires_backend_interface + except AttributeError: + # function does not have requires_backend_interface decorator + filtered_backends.append(backend) + else: required_interfaces = tuple( mark.kwargs["interface"] for mark in required ) if isinstance(backend, required_interfaces): filtered_backends.append(backend) - except AttributeError: - # function does not have requires_backend_interface decorator - filtered_backends.append(backend) if not filtered_backends: pytest.skip( -- cgit v1.2.3 From 56f1a0ae53773285db53c367e697e0a015eed5f1 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 24 Oct 2014 10:30:25 -0700 Subject: add comment explaining some weirdness --- tests/conftest.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index fd618039..1cb2b30d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -40,6 +40,8 @@ def pytest_generate_tests(metafunc): filtered_backends.append(backend) if not filtered_backends: + # If you pass an empty list to parametrize Bad Things(tm) happen + # as of pytest 2.6.4 when the test also has a parametrize decorator pytest.skip( "No backends provided supply the interface: {0}".format( ", ".join(iface.__name__ for iface in required_interfaces) -- cgit v1.2.3 From 902d8cfd58de395748d71f449944faa9dbac8725 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 25 Oct 2014 12:22:10 -0700 Subject: move skip_if_empty to separate function for test coverage --- tests/conftest.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 1cb2b30d..9dc37d38 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -17,7 +17,7 @@ import pytest from cryptography.hazmat.backends import _available_backends -from .utils import check_backend_support, select_backends +from .utils import check_backend_support, select_backends, skip_if_empty def pytest_generate_tests(metafunc): @@ -39,16 +39,11 @@ def pytest_generate_tests(metafunc): if isinstance(backend, required_interfaces): filtered_backends.append(backend) - if not filtered_backends: - # If you pass an empty list to parametrize Bad Things(tm) happen - # as of pytest 2.6.4 when the test also has a parametrize decorator - pytest.skip( - "No backends provided supply the interface: {0}".format( - ", ".join(iface.__name__ for iface in required_interfaces) - ) - ) - else: - metafunc.parametrize("backend", filtered_backends) + # If you pass an empty list to parametrize Bad Things(tm) happen + # as of pytest 2.6.4 when the test also has a parametrize decorator + skip_if_empty(filtered_backends, required_interfaces) + + metafunc.parametrize("backend", filtered_backends) @pytest.mark.trylast -- cgit v1.2.3