diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-19 18:01:40 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-19 18:01:40 -0400 |
| commit | cac36fb8a08b00bee766137fb6fd353e0b399886 (patch) | |
| tree | 1f22e9e3f557d16181646942ea5d6860fa9e3fe3 | |
| parent | f3944404d9a73ad983b1fef05c4e2450e85bf544 (diff) | |
| parent | e85797b3d19e72a8e30a9c3d6ed62127ff1f2b08 (diff) | |
| download | cryptography-cac36fb8a08b00bee766137fb6fd353e0b399886.tar.gz cryptography-cac36fb8a08b00bee766137fb6fd353e0b399886.tar.bz2 cryptography-cac36fb8a08b00bee766137fb6fd353e0b399886.zip | |
Merge pull request #2841 from alex/pytest-report-header
Instead of running a python -c, use pytest_report_header to indicate …
| -rw-r--r-- | tests/conftest.py | 5 | ||||
| -rw-r--r-- | tox.ini | 2 |
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") @@ -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] |