diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 08:45:31 -0600 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 08:45:31 -0600 |
commit | 4b3326eef8e5b2694609701e4fdbdd58cbf96c99 (patch) | |
tree | b0725c7195ff528e1a118f1e0df618dec8b65ef7 /tests/hazmat/primitives/test_hashes.py | |
parent | be91a92cddf6fc54bc6069b2299a650a2edad104 (diff) | |
parent | e60e1d782cb7c1abe68811092f7db342ed14b81f (diff) | |
download | cryptography-4b3326eef8e5b2694609701e4fdbdd58cbf96c99.tar.gz cryptography-4b3326eef8e5b2694609701e4fdbdd58cbf96c99.tar.bz2 cryptography-4b3326eef8e5b2694609701e4fdbdd58cbf96c99.zip |
Merge branch 'master' into fernet
Diffstat (limited to 'tests/hazmat/primitives/test_hashes.py')
-rw-r--r-- | tests/hazmat/primitives/test_hashes.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py index 367e764f..ff42e8f4 100644 --- a/tests/hazmat/primitives/test_hashes.py +++ b/tests/hazmat/primitives/test_hashes.py @@ -20,7 +20,6 @@ import pytest import six from cryptography.exceptions import AlreadyFinalized -from cryptography.hazmat.bindings import _default_backend from cryptography.hazmat.primitives import hashes from .utils import generate_base_hash_test @@ -41,19 +40,12 @@ class TestHashContext(object): assert h._backend is pretend_backend assert h.copy()._backend is h._backend - def test_default_backend_creation(self): - """ - This test assumes the presence of SHA1 in the default backend. - """ - h = hashes.Hash(hashes.SHA1()) - assert h._backend is _default_backend - - def test_hash_algorithm_instance(self): + def test_hash_algorithm_instance(self, backend): with pytest.raises(TypeError): - hashes.Hash(hashes.SHA1) + hashes.Hash(hashes.SHA1, backend=backend) - def test_raises_after_finalize(self): - h = hashes.Hash(hashes.SHA1()) + def test_raises_after_finalize(self, backend): + h = hashes.Hash(hashes.SHA1(), backend=backend) h.finalize() with pytest.raises(AlreadyFinalized): |