aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-11-27 11:36:20 -0600
committerAlex Gaynor <alex.gaynor@gmail.com>2013-11-27 11:36:20 -0600
commit973499aded3ce3580a8c6d44aa111288240f90a1 (patch)
tree5bd90654b015a954936e1dac7ddedd235f22a3b9
parentbb30eb160045181b0c91fc9f2d8f374d65c2c13b (diff)
parent774e2a6ec569c34b30bd9b857826ddb8749d2e9c (diff)
downloadcryptography-973499aded3ce3580a8c6d44aa111288240f90a1.tar.gz
cryptography-973499aded3ce3580a8c6d44aa111288240f90a1.tar.bz2
cryptography-973499aded3ce3580a8c6d44aa111288240f90a1.zip
Merge branch 'master' into validate-iv
-rw-r--r--tests/hazmat/primitives/test_block.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_block.py b/tests/hazmat/primitives/test_block.py
index 2a3e82d4..b0bbba09 100644
--- a/tests/hazmat/primitives/test_block.py
+++ b/tests/hazmat/primitives/test_block.py
@@ -52,10 +52,10 @@ class TestCipher(object):
)
assert isinstance(cipher.decryptor(), interfaces.CipherContext)
- def test_instantiate_with_non_algorithm(self):
+ def test_instantiate_with_non_algorithm(self, backend):
algorithm = object()
with pytest.raises(TypeError):
- Cipher(algorithm, mode=None)
+ Cipher(algorithm, mode=None, backend=backend)
class TestCipherContext(object):