diff options
author | Victor Shyba <victor1984@riseup.net> | 2017-03-27 22:02:43 -0300 |
---|---|---|
committer | drebs <drebs@leap.se> | 2017-04-10 12:51:24 +0200 |
commit | 93fa3fe830b188f3a135fd85ac593bde2c755c2e (patch) | |
tree | d0c155804e7b23f0d53f69760b4742947f05008f /testing/tests/blobs/test_blobs.py | |
parent | a95a015564b8704de4cbf55f6c7439fbecd457c4 (diff) |
[refactor] use fixed rev and remove doc_id (blobs)
doc_id wasn't being stored, loaded or used anywhere except for
authentication. This commit removes it and uses a fixed value for rev
since blobs is supposed to be immutable.
- Resolves: #8813
Diffstat (limited to 'testing/tests/blobs/test_blobs.py')
-rw-r--r-- | testing/tests/blobs/test_blobs.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/testing/tests/blobs/test_blobs.py b/testing/tests/blobs/test_blobs.py index 8dd3abbe..c99cc572 100644 --- a/testing/tests/blobs/test_blobs.py +++ b/testing/tests/blobs/test_blobs.py @@ -19,7 +19,7 @@ Tests for blobs handling. """ from twisted.trial import unittest from twisted.internet import defer -from leap.soledad.client._blobs import DecrypterBuffer, BlobManager +from leap.soledad.client._blobs import DecrypterBuffer, BlobManager, FIXED_REV from leap.soledad.client import _crypto from io import BytesIO from mock import Mock @@ -28,8 +28,8 @@ from mock import Mock class BlobTestCase(unittest.TestCase): class doc_info: - doc_id = 'D-deadbeef' - rev = '397932e0c77f45fcb7c3732930e7e9b2:1' + doc_id = 'D-BLOB-ID' + rev = FIXED_REV def setUp(self): self.cleartext = BytesIO('rosa de foc') @@ -42,9 +42,8 @@ class BlobTestCase(unittest.TestCase): @defer.inlineCallbacks def test_decrypt_buffer(self): encrypted = (yield self.blob.encrypt()).getvalue() - doc_id, rev = self.doc_info.doc_id, self.doc_info.rev tag = encrypted[-16:] - buf = DecrypterBuffer(doc_id, rev, self.secret, tag) + buf = DecrypterBuffer(self.doc_info.doc_id, self.secret, tag) buf.write(encrypted) fd, size = buf.close() self.assertEquals(fd.getvalue(), 'rosa de foc') @@ -63,7 +62,6 @@ class BlobTestCase(unittest.TestCase): defer.returnValue(Mock(code=200)) manager = BlobManager('', '', self.secret, self.secret, 'user') - doc_id, rev = self.doc_info.doc_id, self.doc_info.rev fd = BytesIO('up and up') manager._client.put = _check_result - yield manager._encrypt_and_upload('blob_id', doc_id, rev, fd) + yield manager._encrypt_and_upload(self.doc_info.doc_id, fd) |