From b8b1d7200504e39054222643a88b09761e66d4f8 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Mar 2016 16:47:30 -0400 Subject: Instead of running a python -c, use pytest_report_header to indicate OpenSSL version --- tests/conftest.py | 4 ++++ tox.ini | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index bdd17fb7..d872d7c1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -7,10 +7,14 @@ from __future__ import absolute_import, division, print_function import pytest from cryptography.hazmat.backends import _available_backends +from cryptography.hazmat.backends.openssl import backend as openssl_backend from .utils import check_backend_support, select_backends, skip_if_empty +def pytest_report_header(config): + return "OpenSSL: {}".format(openssl_backend.openssl_version_text()) + def pytest_generate_tests(metafunc): if "backend" in metafunc.fixturenames: names = metafunc.config.getoption("--backend") diff --git a/tox.ini b/tox.ini index 424dc5bb..4db19b82 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,6 @@ deps = passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME commands = pip list - python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())" # We use parallel mode and then combine here so that coverage.py will take # the paths like .tox/py34/lib/python3.4/site-packages/cryptography/__init__.py # and collapse them into src/cryptography/__init__.py. @@ -42,7 +41,6 @@ commands = basepython = pypy commands = pip list - python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())" py.test --capture=no --strict {posargs} [testenv:pep8] -- cgit v1.2.3 From 5930305592bbacbcbb5d8e8fa6faf2767da3b035 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Mar 2016 16:48:18 -0400 Subject: oops, flake8 --- tests/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/conftest.py b/tests/conftest.py index d872d7c1..e2226428 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -15,6 +15,7 @@ from .utils import check_backend_support, select_backends, skip_if_empty def pytest_report_header(config): return "OpenSSL: {}".format(openssl_backend.openssl_version_text()) + def pytest_generate_tests(metafunc): if "backend" in metafunc.fixturenames: names = metafunc.config.getoption("--backend") -- cgit v1.2.3 From e85797b3d19e72a8e30a9c3d6ed62127ff1f2b08 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 19 Mar 2016 16:51:05 -0400 Subject: py26 --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index e2226428..1952ec16 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,7 +13,7 @@ from .utils import check_backend_support, select_backends, skip_if_empty def pytest_report_header(config): - return "OpenSSL: {}".format(openssl_backend.openssl_version_text()) + return "OpenSSL: {0}".format(openssl_backend.openssl_version_text()) def pytest_generate_tests(metafunc): -- cgit v1.2.3