diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 11:36:06 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-27 11:36:06 -0600 |
| commit | 554df80072ede5e154020af39ce0c664de0582b5 (patch) | |
| tree | c7eab20b0edec9efaa68b7d855713525744193a5 /tests | |
| parent | ebf3428ebddb7587b5f25497bed73489386126b5 (diff) | |
| parent | 774e2a6ec569c34b30bd9b857826ddb8749d2e9c (diff) | |
| download | cryptography-554df80072ede5e154020af39ce0c664de0582b5.tar.gz cryptography-554df80072ede5e154020af39ce0c664de0582b5.tar.bz2 cryptography-554df80072ede5e154020af39ce0c664de0582b5.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/hazmat/primitives/test_block.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_block.py b/tests/hazmat/primitives/test_block.py index 4a8e88b4..f6c44b47 100644 --- a/tests/hazmat/primitives/test_block.py +++ b/tests/hazmat/primitives/test_block.py @@ -47,10 +47,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): |