diff options
| author | David Reid <dreid@dreid.org> | 2013-11-12 15:50:43 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-11-12 15:50:43 -0800 |
| commit | fcd36a9bb98fe6e13bc37cc833f317a3ee656eef (patch) | |
| tree | adc44cfbca50c99f261c45d893d9378ea57e673b /tests/hazmat | |
| parent | 9d0d94d97cb8ed8d15b24018e20c08cf1f7b78b4 (diff) | |
| parent | 4faa094526f49c83a75d21a6e796546d4d539c6c (diff) | |
| download | cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.tar.gz cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.tar.bz2 cryptography-fcd36a9bb98fe6e13bc37cc833f317a3ee656eef.zip | |
Merge branch 'master' into hmac-context-from-backend
Conflicts:
cryptography/hazmat/bindings/openssl/backend.py
cryptography/hazmat/primitives/hmac.py
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/primitives/test_hashes.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py index 07ab2489..6cdb0a07 100644 --- a/tests/hazmat/primitives/test_hashes.py +++ b/tests/hazmat/primitives/test_hashes.py @@ -32,9 +32,9 @@ class TestHashContext(object): m.update(six.u("\u00FC")) def test_copy_backend_object(self): - pretend_hashes = pretend.stub(copy_ctx=lambda a: "copiedctx") - pretend_backend = pretend.stub(hashes=pretend_hashes) - pretend_ctx = pretend.stub() + pretend_backend = pretend.stub() + copied_ctx = pretend.stub() + pretend_ctx = pretend.stub(copy=lambda: copied_ctx) h = hashes.Hash(hashes.SHA1(), backend=pretend_backend, ctx=pretend_ctx) assert h._backend is pretend_backend |