diff options
| author | Victor Shyba <victor1984@riseup.net> | 2016-11-26 18:09:26 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-12-12 09:17:51 -0200 |
| commit | 42082cfa648ec10612823086e72dc2a70a0e773c (patch) | |
| tree | 62c8f70d5d4207b49d2b35cbe759d85b9b6ccda5 /testing | |
| parent | e65cb7bfecd530252e86878dfec117c2793aa04b (diff) | |
[feature] make _crypto stream on decryption
We are already doing this on encryption, now we can stream also from
decryption. This unblocks the reactor and will be valuable for blobs-io.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/tests/benchmarks/test_crypto.py | 4 | ||||
| -rw-r--r-- | testing/tests/client/test_crypto.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/testing/tests/benchmarks/test_crypto.py b/testing/tests/benchmarks/test_crypto.py index 75ad9a30..8ee9b899 100644 --- a/testing/tests/benchmarks/test_crypto.py +++ b/testing/tests/benchmarks/test_crypto.py @@ -39,7 +39,7 @@ def create_doc_encryption(size): def create_doc_decryption(size): @pytest.inlineCallbacks @pytest.mark.benchmark(group="test_crypto_decrypt_doc") - def test_doc_decryption(soledad_client, benchmark, payload): + def test_doc_decryption(soledad_client, txbenchmark, payload): crypto = soledad_client()._crypto DOC_CONTENT = {'payload': payload(size)} @@ -50,7 +50,7 @@ def create_doc_decryption(size): encrypted_doc = yield crypto.encrypt_doc(doc) doc.set_json(encrypted_doc) - benchmark(crypto.decrypt_doc, doc) + yield txbenchmark(crypto.decrypt_doc, doc) return test_doc_decryption diff --git a/testing/tests/client/test_crypto.py b/testing/tests/client/test_crypto.py index 78da8d24..863873f7 100644 --- a/testing/tests/client/test_crypto.py +++ b/testing/tests/client/test_crypto.py @@ -139,7 +139,7 @@ class BlobTestCase(unittest.TestCase): self.doc_info, ciphertext, secret='A' * 96) decrypted = yield decryptor.decrypt() - assert decrypted.getvalue() == snowden1 + assert decrypted == snowden1 @defer.inlineCallbacks def test_encrypt_and_decrypt(self): |