[bug] check all http response status codes

2 files changed, 45 insertions, 4 deletions

diff --git a/tests/blobs/test_fs_backend.py b/tests/blobs/test_fs_backend.py
index 53f3127d..07443b8a 100644
--- a/tests/blobs/test_fs_backend.py
+++ b/tests/blobs/test_fs_backend.py
@@ -20,6 +20,7 @@ Tests for blobs backend on server side.
 from twisted.trial import unittest
 from twisted.internet import defer
 from twisted.web.test.test_web import DummyRequest
+from leap.common.files import mkdir_p
 from leap.soledad.server import _blobs
 from io import BytesIO
 from mock import Mock
@@ -38,18 +39,25 @@ class FilesystemBackendTestCase(unittest.TestCase):
         expected_tag = base64.urlsafe_b64encode('B' * 16)
         expected_method = Mock()
         backend = _blobs.FilesystemBlobsBackend()
+        # write a blob...
+        path = backend._get_path('user', 'blob_id', '')
+        mkdir_p(os.path.split(path)[0])
+        with open(path, "w") as f:
+            f.write("bl0b")
+        # ...and get its tag
         request = Mock(responseHeaders=Mock(setRawHeaders=expected_method))
         backend.add_tag_header('user', 'blob_id', request)
 
         expected_method.assert_called_once_with('Tag', [expected_tag])
 
     @mock.patch.object(_blobs.static, 'File')
+    @mock.patch.object(_blobs.FilesystemBlobsBackend, '_get_path',
+                       Mock(return_value='path'))
     def test_read_blob(self, file_mock):
         render_mock = Mock()
         file_mock.return_value = render_mock
         backend = _blobs.FilesystemBlobsBackend()
         request = DummyRequest([''])
-        backend._get_path = Mock(return_value='path')
         backend.read_blob('user', 'blob_id', request)
 
         backend._get_path.assert_called_once_with('user', 'blob_id', '')
@@ -58,11 +66,12 @@ class FilesystemBackendTestCase(unittest.TestCase):
         render_mock.render_GET.assert_called_once_with(request)
 
     @mock.patch.object(os.path, 'isfile')
+    @mock.patch.object(_blobs.FilesystemBlobsBackend, '_get_path',
+                       Mock(return_value='path'))
     @defer.inlineCallbacks
     def test_cannot_overwrite(self, isfile):
         isfile.return_value = True
         backend = _blobs.FilesystemBlobsBackend()
-        backend._get_path = Mock(return_value='path')
         request = DummyRequest([''])
         yield backend.write_blob('user', 'blob_id', request)
         self.assertEquals(request.written[0], "Blob already exists: blob_id")
@@ -154,7 +163,14 @@ class FilesystemBackendTestCase(unittest.TestCase):
     @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')
+        request = DummyRequest([''])
+        # write a blob...
+        path = backend._get_path('user', 'blob_id', '')
+        mkdir_p(os.path.split(path)[0])
+        with open(path, "w") as f:
+            f.write("bl0b")
+        # ...and delete it
+        backend.delete_blob('user', 'blob_id', request)
         unlink_mock.assert_any_call(backend._get_path('user',
                                                       'blob_id'))
         unlink_mock.assert_any_call(backend._get_path('user',
@@ -164,7 +180,14 @@ class FilesystemBackendTestCase(unittest.TestCase):
     @mock.patch('leap.soledad.server._blobs.os.unlink')
     def test_delete_blob_custom_namespace(self, unlink_mock):
         backend = _blobs.FilesystemBlobsBackend(self.tempdir)
-        backend.delete_blob('user', 'blob_id', namespace='trash')
+        request = DummyRequest([''])
+        # write a blob...
+        path = backend._get_path('user', 'blob_id', 'trash')
+        mkdir_p(os.path.split(path)[0])
+        with open(path, "w") as f:
+            f.write("bl0b")
+        # ...and delete it
+        backend.delete_blob('user', 'blob_id', request, namespace='trash')
         unlink_mock.assert_any_call(backend._get_path('user',
                                                       'blob_id',
                                                       'trash'))
diff --git a/tests/server/test_blobs_server.py b/tests/server/test_blobs_server.py
index 2ee6fda2..c628ae78 100644
--- a/tests/server/test_blobs_server.py
+++ b/tests/server/test_blobs_server.py
@@ -292,3 +292,21 @@ class BlobServerTestCase(unittest.TestCase):
         yield manager._delete_from_remote('blob_id1', namespace=namespace)
         blobs_list = yield manager.remote_list(namespace=namespace)
         self.assertEquals(set(['blob_id2']), set(blobs_list))
+
+    @defer.inlineCallbacks
+    @pytest.mark.usefixtures("method_tmpdir")
+    def test_get_fails_if_no_blob_found(self):
+        manager = BlobManager(self.tempdir, self.uri, self.secret,
+                              self.secret, uuid4().hex)
+        self.addCleanup(manager.close)
+        with pytest.raises(SoledadError):
+            yield manager.get('missing_id')
+
+    @defer.inlineCallbacks
+    @pytest.mark.usefixtures("method_tmpdir")
+    def test_delete_fails_if_no_blob_found(self):
+        manager = BlobManager(self.tempdir, self.uri, self.secret,
+                              self.secret, uuid4().hex)
+        self.addCleanup(manager.close)
+        with pytest.raises(SoledadError):
+            yield manager.delete('missing_id')