aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/utils.py
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-27 11:09:54 -0500
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-27 11:09:54 -0500
commit504e3cfd829f6b5348f27013a8626106aa6cf995 (patch)
tree5dfebbb72769a9886bb43236f884c0ae900617db /tests/hazmat/primitives/utils.py
parent3d1d97fa108ced9eae99fc99a5d6399811022425 (diff)
parentb645521e84026633f666aa107816ac2fc5e05cc6 (diff)
downloadcryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.tar.gz
cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.tar.bz2
cryptography-504e3cfd829f6b5348f27013a8626106aa6cf995.zip
Merge remote-tracking branch 'origin/master' into pyopenssl-test_crypto-with-optionals
Diffstat (limited to 'tests/hazmat/primitives/utils.py')
-rw-r--r--tests/hazmat/primitives/utils.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py
index b00d3184..e0184777 100644
--- a/tests/hazmat/primitives/utils.py
+++ b/tests/hazmat/primitives/utils.py
@@ -22,8 +22,7 @@ def _load_all_params(path, file_names, param_loader):
def generate_encrypt_test(param_loader, path, file_names, cipher_factory,
- mode_factory, only_if=lambda backend: True,
- skip_message=None):
+ mode_factory, only_if, skip_message=None):
all_params = _load_all_params(path, file_names, param_loader)
@pytest.mark.parametrize("params", all_params)