Merge pull request #849 from public/changeup-exceptions-2-electric-boogaloo

Use a single tagged exception instead of a hierarchy

1 files changed, 7 insertions, 5 deletions

diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py
index 3747f436..016da0fc 100644
--- a/tests/hazmat/backends/test_openssl.py
+++ b/tests/hazmat/backends/test_openssl.py
@@ -17,7 +17,7 @@ import pytest
 
 from cryptography import utils
 from cryptography.exceptions import (
-    InternalError, UnsupportedCipher, UnsupportedHash
+    InternalError, _Reasons
 )
 from cryptography.hazmat.backends.openssl.backend import Backend, backend
 from cryptography.hazmat.primitives import hashes, interfaces
@@ -26,6 +26,8 @@ from cryptography.hazmat.primitives.ciphers import Cipher
 from cryptography.hazmat.primitives.ciphers.algorithms import AES
 from cryptography.hazmat.primitives.ciphers.modes import CBC
 
+from ...utils import raises_unsupported_algorithm
+
 
 @utils.register_interface(interfaces.Mode)
 class DummyMode(object):
@@ -78,7 +80,7 @@ class TestOpenSSL(object):
         cipher = Cipher(
             DummyCipher(), mode, backend=b,
         )
-        with pytest.raises(UnsupportedCipher):
+        with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_CIPHER):
             cipher.encryptor()
 
     def test_consume_errors(self):
@@ -140,7 +142,7 @@ class TestOpenSSL(object):
     def test_derive_pbkdf2_raises_unsupported_on_old_openssl(self):
         if backend.pbkdf2_hmac_supported(hashes.SHA256()):
             pytest.skip("Requires an older OpenSSL")
-        with pytest.raises(UnsupportedHash):
+        with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_HASH):
             backend.derive_pbkdf2_hmac(hashes.SHA256(), 10, b"", 1000, b"")
 
     @pytest.mark.skipif(
@@ -153,7 +155,7 @@ class TestOpenSSL(object):
             key_size=512,
             backend=backend
         )
-        with pytest.raises(UnsupportedHash):
+        with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_HASH):
             private_key.signer(
                 padding.PSS(
                     mgf=padding.MGF1(
@@ -165,7 +167,7 @@ class TestOpenSSL(object):
                 backend
             )
         public_key = private_key.public_key()
-        with pytest.raises(UnsupportedHash):
+        with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_HASH):
             public_key.verifier(
                 b"sig",
                 padding.PSS(