diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 14:27:52 -0700 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 14:27:52 -0700 |
commit | 512dd6925202c5dc6680dd7157a132a9ffc4855f (patch) | |
tree | 825f91b14d8bf539bde5e4f3b7ec670f078e8a68 /tests/primitives/test_openssl_vectors.py | |
parent | a20631d332d47903a85b61c4b68c5398125a3ebe (diff) | |
download | cryptography-512dd6925202c5dc6680dd7157a132a9ffc4855f.tar.gz cryptography-512dd6925202c5dc6680dd7157a132a9ffc4855f.tar.bz2 cryptography-512dd6925202c5dc6680dd7157a132a9ffc4855f.zip |
Move around the skip logic
Diffstat (limited to 'tests/primitives/test_openssl_vectors.py')
-rw-r--r-- | tests/primitives/test_openssl_vectors.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/primitives/test_openssl_vectors.py b/tests/primitives/test_openssl_vectors.py index f9c4e1fa..6e32eca6 100644 --- a/tests/primitives/test_openssl_vectors.py +++ b/tests/primitives/test_openssl_vectors.py @@ -18,10 +18,6 @@ Test using the OpenSSL Test Vectors from __future__ import absolute_import, division, print_function import binascii -import itertools -import os - -import pytest from cryptography.primitives.block import ciphers, modes @@ -36,7 +32,8 @@ class TestCamelliaCBC(object): ["camellia-cbc.txt"], lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.CBC(binascii.unhexlify(iv)), - only_if=lambda api: api.supports_cipher("camellia-128-cbc") + only_if=lambda api: api.supports_cipher("camellia-128-cbc"), + skip_message="Does not support Camellia CBC", ) @@ -47,7 +44,8 @@ class TestCamelliaOFB(object): ["camellia-ofb.txt"], lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.OFB(binascii.unhexlify(iv)), - only_if=lambda api: api.supports_cipher("camellia-128-ofb") + only_if=lambda api: api.supports_cipher("camellia-128-ofb"), + skip_message="Does not support Camellia OFB", ) @@ -58,5 +56,6 @@ class TestCamelliaCFB(object): ["camellia-cfb.txt"], lambda key, iv: ciphers.Camellia(binascii.unhexlify(key)), lambda key, iv: modes.CFB(binascii.unhexlify(iv)), - only_if=lambda api: api.supports_cipher("camellia-128-cfb") + only_if=lambda api: api.supports_cipher("camellia-128-cfb"), + skip_message="Does not support Camellia CFB", ) |