From cee3736564033cce48f39ab5653f3ba323da0e10 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 17 Oct 2015 09:40:05 -0500 Subject: make skip message more verbose --- tests/hazmat/primitives/test_keywrap.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'tests/hazmat/primitives/test_keywrap.py') diff --git a/tests/hazmat/primitives/test_keywrap.py b/tests/hazmat/primitives/test_keywrap.py index f49cdade..b1cf5ed8 100644 --- a/tests/hazmat/primitives/test_keywrap.py +++ b/tests/hazmat/primitives/test_keywrap.py @@ -31,7 +31,8 @@ class TestAESKeyWrap(object): only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 16), modes.ECB() ), - skip_message="Does not support AES key wrap (RFC 3394)", + skip_message="Does not support AES key wrap (RFC 3394) because AES-ECB" + " is unsupported", ) def test_wrap(self, backend, params): wrapping_key = binascii.unhexlify(params["k"]) @@ -51,7 +52,8 @@ class TestAESKeyWrap(object): only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 16), modes.ECB() ), - skip_message="Does not support AES key wrap (RFC 3394)", + skip_message="Does not support AES key wrap (RFC 3394) because AES-ECB" + " is unsupported", ) def test_unwrap(self, backend, params): wrapping_key = binascii.unhexlify(params["k"]) @@ -69,7 +71,8 @@ class TestAESKeyWrap(object): only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 16), modes.ECB() ), - skip_message="Does not support AES key wrap (RFC 3394)", + skip_message="Does not support AES key wrap (RFC 3394) because AES-ECB" + " is unsupported", ) def test_wrap_invalid_key_length(self, backend): with pytest.raises(ValueError): @@ -79,7 +82,8 @@ class TestAESKeyWrap(object): only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 16), modes.ECB() ), - skip_message="Does not support AES key wrap (RFC 3394)", + skip_message="Does not support AES key wrap (RFC 3394) because AES-ECB" + " is unsupported", ) def test_unwrap_invalid_key_length(self, backend): with pytest.raises(ValueError): @@ -89,7 +93,8 @@ class TestAESKeyWrap(object): only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 16), modes.ECB() ), - skip_message="Does not support AES key wrap (RFC 3394)", + skip_message="Does not support AES key wrap (RFC 3394) because AES-ECB" + " is unsupported", ) def test_wrap_invalid_key_to_wrap_length(self, backend): with pytest.raises(ValueError): @@ -98,12 +103,6 @@ class TestAESKeyWrap(object): with pytest.raises(ValueError): keywrap.aes_key_wrap(b"sixteen_byte_key", b"\x00" * 23, backend) - @pytest.mark.supported( - only_if=lambda backend: backend.cipher_supported( - algorithms.AES("\x00" * 16), modes.ECB() - ), - skip_message="Does not support AES key wrap (RFC 3394)", - ) def test_unwrap_invalid_wrapped_key_length(self, backend): with pytest.raises(ValueError): keywrap.aes_key_unwrap(b"sixteen_byte_key", b"\x00" * 16, backend) -- cgit v1.2.3