diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-09-14 04:57:19 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-09-14 04:57:19 -0500 |
| commit | 9122a9d047765574bb0d11436522a6c868da86cc (patch) | |
| tree | 7a1799958c41cdcb388692d5e894c82f8a5667c4 /mediagoblin/tests | |
| parent | 8c12e57b9e0db109e0fc3211ec1a8145ef3d3eb1 (diff) | |
| parent | fd10c71644f12b0a56247c782566af1c37df5851 (diff) | |
| download | mediagoblin-9122a9d047765574bb0d11436522a6c868da86cc.tar.lz mediagoblin-9122a9d047765574bb0d11436522a6c868da86cc.tar.xz mediagoblin-9122a9d047765574bb0d11436522a6c868da86cc.zip | |
Merge remote branch 'remotes/jwandborg/f587-split_storage_into_submodules'
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_storage.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py index 9c96f6ca..46ecb2ec 100644 --- a/mediagoblin/tests/test_storage.py +++ b/mediagoblin/tests/test_storage.py @@ -52,7 +52,7 @@ class FakeStorageSystem(): self.foobie = foobie self.blech = blech -class FakeRemoteStorage(storage.BasicFileStorage): +class FakeRemoteStorage(storage.filestorage.BasicFileStorage): # Theoretically despite this, all the methods should work but it # should force copying to the workbench local_storage = False @@ -66,7 +66,7 @@ def test_storage_system_from_config(): 'garbage_arg': 'trash'}) assert this_storage.base_url == 'http://example.org/moodia/' assert this_storage.base_dir == '/tmp/' - assert this_storage.__class__ is storage.BasicFileStorage + assert this_storage.__class__ is storage.filestorage.BasicFileStorage this_storage = storage.storage_system_from_config( {'foobie': 'eiboof', @@ -88,7 +88,7 @@ def get_tmp_filestorage(mount_url=None, fake_remote=False): if fake_remote: this_storage = FakeRemoteStorage(tmpdir, mount_url) else: - this_storage = storage.BasicFileStorage(tmpdir, mount_url) + this_storage = storage.filestorage.BasicFileStorage(tmpdir, mount_url) return tmpdir, this_storage |