aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/conftest.py5
-rw-r--r--tox.ini2
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index bdd17fb7..1952ec16 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -7,10 +7,15 @@ 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: {0}".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 a700d4dc..e5efefcb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,6 @@ setenv =
CRYPTOGRAPHY_ALLOW_OPENSSL_098=1
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.
@@ -44,7 +43,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]