From 34c075e6f331d146a617417e646170e8847c39e4 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 13 Jan 2014 21:52:08 -0500 Subject: support --backend as a pytest flag to limit to one backend for testing --- tests/conftest.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 1d9f96ed..5cc30428 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,7 +5,12 @@ from cryptography.hazmat.backends.interfaces import ( HMACBackend, CipherBackend, HashBackend ) -from .utils import check_for_iface, check_backend_support +from .utils import check_for_iface, check_backend_support, modify_backend_list + + +def pytest_generate_tests(metafunc): + name = metafunc.config.getoption("--backend") + modify_backend_list(name, _ALL_BACKENDS) @pytest.fixture(params=_ALL_BACKENDS) @@ -19,3 +24,10 @@ def pytest_runtest_setup(item): check_for_iface("cipher", CipherBackend, item) check_for_iface("hash", HashBackend, item) check_backend_support(item) + + +def pytest_addoption(parser): + parser.addoption( + "--backend", action="store", metavar="NAME", + help="Only run tests matching the backend NAME." + ) -- cgit v1.2.3 From 098579e27f380ce95f620b34984f20342db2395f Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 14 Jan 2014 10:26:44 -0500 Subject: don't mutate _ALL_BACKENDS --- tests/conftest.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 5cc30428..86debe7c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,12 +8,19 @@ from cryptography.hazmat.backends.interfaces import ( from .utils import check_for_iface, check_backend_support, modify_backend_list +# copy all backends so we can mutate it.This variable is used in generate +# tests to allow us to target a single backend without changing _ALL_BACKENDS + +_UPDATED_BACKENDS = list(_ALL_BACKENDS) + + def pytest_generate_tests(metafunc): + global _UPDATED_BACKENDS name = metafunc.config.getoption("--backend") - modify_backend_list(name, _ALL_BACKENDS) + modify_backend_list(name, _UPDATED_BACKENDS) -@pytest.fixture(params=_ALL_BACKENDS) +@pytest.fixture(params=_UPDATED_BACKENDS) def backend(request): return request.param -- cgit v1.2.3 From 681e7a5587e78918fd15af5255204216d0ea7237 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 14 Jan 2014 10:48:56 -0500 Subject: better name for the variable --- tests/conftest.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 86debe7c..49e178bc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,17 +10,16 @@ from .utils import check_for_iface, check_backend_support, modify_backend_list # copy all backends so we can mutate it.This variable is used in generate # tests to allow us to target a single backend without changing _ALL_BACKENDS - -_UPDATED_BACKENDS = list(_ALL_BACKENDS) +_DESIRED_BACKENDS = list(_ALL_BACKENDS) def pytest_generate_tests(metafunc): - global _UPDATED_BACKENDS + global _DESIRED_BACKENDS name = metafunc.config.getoption("--backend") - modify_backend_list(name, _UPDATED_BACKENDS) + modify_backend_list(name, _DESIRED_BACKENDS) -@pytest.fixture(params=_UPDATED_BACKENDS) +@pytest.fixture(params=_DESIRED_BACKENDS) def backend(request): return request.param -- cgit v1.2.3 From c421e636b15768e1adaf8bf681ecdd12b96c8669 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 18 Jan 2014 09:22:21 -0600 Subject: modify backend selection to allow multiple backends via comma delimiter --- tests/conftest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 49e178bc..b9879f86 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,21 +5,21 @@ from cryptography.hazmat.backends.interfaces import ( HMACBackend, CipherBackend, HashBackend ) -from .utils import check_for_iface, check_backend_support, modify_backend_list +from .utils import check_for_iface, check_backend_support, select_backends # copy all backends so we can mutate it.This variable is used in generate # tests to allow us to target a single backend without changing _ALL_BACKENDS -_DESIRED_BACKENDS = list(_ALL_BACKENDS) +_SELECTED_BACKENDS = list(_ALL_BACKENDS) def pytest_generate_tests(metafunc): - global _DESIRED_BACKENDS - name = metafunc.config.getoption("--backend") - modify_backend_list(name, _DESIRED_BACKENDS) + global _SELECTED_BACKENDS + names = metafunc.config.getoption("--backend") + _SELECTED_BACKENDS = select_backends(names, _SELECTED_BACKENDS) -@pytest.fixture(params=_DESIRED_BACKENDS) +@pytest.fixture(params=_SELECTED_BACKENDS) def backend(request): return request.param -- cgit v1.2.3 From aed9e17b6080d540ba5b5aab5e3096581a4bbd13 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 19 Jan 2014 12:09:27 -0600 Subject: revert fixture decorator for now, switch to append. no more globals --- tests/conftest.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index b9879f86..a9acb54a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,20 +8,12 @@ from cryptography.hazmat.backends.interfaces import ( from .utils import check_for_iface, check_backend_support, select_backends -# copy all backends so we can mutate it.This variable is used in generate -# tests to allow us to target a single backend without changing _ALL_BACKENDS -_SELECTED_BACKENDS = list(_ALL_BACKENDS) - - def pytest_generate_tests(metafunc): - global _SELECTED_BACKENDS names = metafunc.config.getoption("--backend") - _SELECTED_BACKENDS = select_backends(names, _SELECTED_BACKENDS) - + selected_backends = select_backends(names, _ALL_BACKENDS) -@pytest.fixture(params=_SELECTED_BACKENDS) -def backend(request): - return request.param + if "backend" in metafunc.fixturenames: + metafunc.parametrize("backend", selected_backends) @pytest.mark.trylast -- cgit v1.2.3