summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-12-06 19:24:39 -0200
committerdrebs <drebs@leap.se>2017-12-13 13:43:47 -0200
commitfc0725b0827b6f5e02f1d155712b106b3c8854c1 (patch)
treef4347e477725a17d291c5ac0826326430f7e687b /tests
parent9f07826cd98448b38646b2c731f82f99ee37f7c4 (diff)
[refactor] make blobs backend list_blobs() agnostic of twisted.web requests
Diffstat (limited to 'tests')
-rw-r--r--tests/blobs/test_fs_backend.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/blobs/test_fs_backend.py b/tests/blobs/test_fs_backend.py
index eada044a..5df658ff 100644
--- a/tests/blobs/test_fs_backend.py
+++ b/tests/blobs/test_fs_backend.py
@@ -26,7 +26,6 @@ from mock import Mock
import mock
import os
import base64
-import json
import pytest
@@ -131,7 +130,7 @@ class FilesystemBackendTestCase(unittest.TestCase):
backend = _blobs.FilesystemBlobsBackend(blobs_path=self.tempdir)
_ = None
walk_mock.return_value = [('', _, ['blob_0']), ('', _, ['blob_1'])]
- result = json.loads(backend.list_blobs('user', DummyRequest([''])))
+ result = backend.list_blobs('user')
self.assertEquals(result, ['blob_0', 'blob_1'])
@pytest.mark.usefixtures("method_tmpdir")
@@ -140,8 +139,7 @@ class FilesystemBackendTestCase(unittest.TestCase):
backend = _blobs.FilesystemBlobsBackend(self.tempdir)
_ = None
walk_mock.return_value = [('', _, ['blob_0']), ('', _, ['blob_1'])]
- result = json.loads(backend.list_blobs('user', DummyRequest(['']),
- namespace='incoming'))
+ result = 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)