From 8a6c8274c37b045d1a6198b6ff585940811da18a Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Tue, 2 May 2017 00:08:27 -0300
Subject: [feature] add and integrate DELETE to blobs server

Add a DELETE method for blobs server and integrate it into client's
BlobManager.
- Resolves: #8846
---
 testing/tests/blobs/test_blob_manager.py  | 13 +++++++++++++
 testing/tests/blobs/test_fs_backend.py    |  8 ++++++++
 testing/tests/server/test_blobs_server.py | 11 +++++++++++
 3 files changed, 32 insertions(+)

(limited to 'testing/tests')

diff --git a/testing/tests/blobs/test_blob_manager.py b/testing/tests/blobs/test_blob_manager.py
index 69a272c8..4d04e09d 100644
--- a/testing/tests/blobs/test_blob_manager.py
+++ b/testing/tests/blobs/test_blob_manager.py
@@ -130,3 +130,16 @@ class BlobManagerTestCase(unittest.TestCase):
         with pytest.raises(BlobAlreadyExistsError):
             yield self.manager.put(doc2, len(content))
         self.assertFalse(self.manager._encrypt_and_upload.called)
+
+    @defer.inlineCallbacks
+    @pytest.mark.usefixtures("method_tmpdir")
+    def test_delete_from_local_and_remote(self):
+        self.manager._encrypt_and_upload = Mock(return_value=None)
+        self.manager._delete_from_remote = Mock(return_value=None)
+        content = "Blob content"
+        doc1 = BlobDoc(BytesIO(content), 'blob_id')
+        yield self.manager.put(doc1, len(content))
+        yield self.manager.delete('blob_id')
+        local_list = yield self.manager.local_list()
+        self.assertEquals(0, len(local_list))
+        self.manager._delete_from_remote.assert_called_with('blob_id')
diff --git a/testing/tests/blobs/test_fs_backend.py b/testing/tests/blobs/test_fs_backend.py
index f6f2db2d..83a5708e 100644
--- a/testing/tests/blobs/test_fs_backend.py
+++ b/testing/tests/blobs/test_fs_backend.py
@@ -120,3 +120,11 @@ class FilesystemBackendTestCase(unittest.TestCase):
             yield backend.write_blob('valid', '../../../', DummyRequest(['']))
         with pytest.raises(Exception):
             yield backend.write_blob('../../../', 'valid', DummyRequest(['']))
+
+    @pytest.mark.usefixtures("method_tmpdir")
+    @mock.patch('leap.soledad.server._blobs.os.unlink')
+    def test_delete_blob(self, unlink_mock):
+        backend = _blobs.FilesystemBlobsBackend(self.tempdir)
+        backend.delete_blob('user', 'blob_id')
+        unlink_mock.assert_called_once_with(backend._get_path('user',
+                                                              'blob_id'))
diff --git a/testing/tests/server/test_blobs_server.py b/testing/tests/server/test_blobs_server.py
index cd39833f..2fd66224 100644
--- a/testing/tests/server/test_blobs_server.py
+++ b/testing/tests/server/test_blobs_server.py
@@ -100,3 +100,14 @@ class BlobServerTestCase(unittest.TestCase):
         result = yield manager.local.get(blob_id)
         self.assertIsNotNone(result)
         self.assertEquals(result.getvalue(), "X")
+
+    @defer.inlineCallbacks
+    @pytest.mark.usefixtures("method_tmpdir")
+    def test_upload_then_delete_updates_list(self):
+        manager = BlobManager('', self.uri, self.secret,
+                              self.secret, 'user')
+        yield manager._encrypt_and_upload('blob_id1', BytesIO("1"))
+        yield manager._encrypt_and_upload('blob_id2', BytesIO("2"))
+        yield manager._delete_from_remote('blob_id1')
+        blobs_list = yield manager.remote_list()
+        self.assertEquals(set(['blob_id2']), set(blobs_list))
-- 
cgit v1.2.3