summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-12-09 08:09:34 -0200
committerdrebs <drebs@leap.se>2017-12-13 13:49:27 -0200
commit94ddb9f80273a3db3fedfdc7a846a1ebeedd0003 (patch)
tree00426c4ffca2de63bf90999eadfdd6fe3852019d /tests
parent8a1ab21e09632928be79fdf7473073ae363f8231 (diff)
[refactor] make read_blob() return a deferred
Diffstat (limited to 'tests')
-rw-r--r--tests/blobs/test_fs_backend.py16
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/blobs/test_fs_backend.py b/tests/blobs/test_fs_backend.py
index 816cba39..28be4835 100644
--- a/tests/blobs/test_fs_backend.py
+++ b/tests/blobs/test_fs_backend.py
@@ -63,21 +63,15 @@ class FilesystemBackendTestCase(unittest.TestCase):
self.assertEquals(10, size)
@pytest.mark.usefixtures("method_tmpdir")
- @mock.patch.object(_blobs.static, 'File')
+ @mock.patch('leap.soledad.server._blobs.open')
@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
+ @defer.inlineCallbacks
+ def test_read_blob(self, open):
backend = _blobs.FilesystemBlobsBackend(blobs_path=self.tempdir)
- request = DummyRequest([''])
- resource = backend.read_blob('user', 'blob_id')
- resource.render_GET(request)
-
+ yield backend.read_blob('user', 'blob_id')
+ open.assert_called_once_with('path')
backend._get_path.assert_called_once_with('user', 'blob_id', '')
- ctype = 'application/octet-stream'
- _blobs.static.File.assert_called_once_with('path', defaultType=ctype)
- render_mock.render_GET.assert_called_once_with(request)
@pytest.mark.usefixtures("method_tmpdir")
@mock.patch.object(os.path, 'isfile')