aboutsummaryrefslogtreecommitdiffstats
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-12-24 22:43:46 -0800
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-12-24 22:43:46 -0800
commit0865a8b81075bfe073aba56e03cc57c30bfffe00 (patch)
treef029d15b5d36d05bfad67c9aac157ffdb139a417 /tests/conftest.py
parent348c80f2eba66b5c1b7f4c3a5ee8fc330895ae4e (diff)
parent2b3f94271209883aab4181ac5401c699c5c60b75 (diff)
downloadcryptography-0865a8b81075bfe073aba56e03cc57c30bfffe00.tar.gz
cryptography-0865a8b81075bfe073aba56e03cc57c30bfffe00.tar.bz2
cryptography-0865a8b81075bfe073aba56e03cc57c30bfffe00.zip
Merge pull request #347 from alex/better-error-emssage
Better error emssage
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 91ba988f..e059b630 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,7 +4,7 @@ from cryptography.hazmat.backends.interfaces import (
HMACBackend, CipherBackend, HashBackend
)
-from .skip_check import skip_check
+from .utils import check_for_iface
def pytest_generate_tests(metafunc):
@@ -16,6 +16,6 @@ def pytest_generate_tests(metafunc):
@pytest.mark.trylast
def pytest_runtest_setup(item):
- skip_check('hmac', HMACBackend, item)
- skip_check('cipher', CipherBackend, item)
- skip_check('hash', HashBackend, item)
+ check_for_iface("hmac", HMACBackend, item)
+ check_for_iface("cipher", CipherBackend, item)
+ check_for_iface("hash", HashBackend, item)