summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-12-08 22:34:34 -0200
committerdrebs <drebs@leap.se>2017-12-13 13:49:27 -0200
commit7aa8e9496e74f8f1265bf008ae412a3f733ea2b4 (patch)
treea0e62b96d3a2da3d5cada84f3c8ebd421c9952a6 /tests
parent96dff026a7b58d116543b4f181c93946e04894b0 (diff)
[refactor] make list_blobs() return a deferred
Diffstat (limited to 'tests')
-rw-r--r--tests/blobs/test_fs_backend.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/blobs/test_fs_backend.py b/tests/blobs/test_fs_backend.py
index e77e56b0..727ffe92 100644
--- a/tests/blobs/test_fs_backend.py
+++ b/tests/blobs/test_fs_backend.py
@@ -127,20 +127,22 @@ class FilesystemBackendTestCase(unittest.TestCase):
@pytest.mark.usefixtures("method_tmpdir")
@mock.patch('leap.soledad.server._blobs.os.walk')
+ @defer.inlineCallbacks
def test_list_blobs(self, walk_mock):
backend = _blobs.FilesystemBlobsBackend(blobs_path=self.tempdir)
_ = None
walk_mock.return_value = [('', _, ['blob_0']), ('', _, ['blob_1'])]
- result = backend.list_blobs('user')
+ result = yield backend.list_blobs('user')
self.assertEquals(result, ['blob_0', 'blob_1'])
@pytest.mark.usefixtures("method_tmpdir")
@mock.patch('leap.soledad.server._blobs.os.walk')
+ @defer.inlineCallbacks
def test_list_blobs_limited_by_namespace(self, walk_mock):
backend = _blobs.FilesystemBlobsBackend(self.tempdir)
_ = None
walk_mock.return_value = [('', _, ['blob_0']), ('', _, ['blob_1'])]
- result = backend.list_blobs('user', namespace='incoming')
+ result = yield backend.list_blobs('user', namespace='incoming')
self.assertEquals(result, ['blob_0', 'blob_1'])
target_dir = os.path.join(self.tempdir, 'user', 'incoming')
walk_mock.assert_called_once_with(target_dir)