diff options
author | Joar Wandborg <git@wandborg.com> | 2011-09-12 02:32:03 +0200 |
---|---|---|
committer | Joar Wandborg <git@wandborg.com> | 2011-09-12 02:32:03 +0200 |
commit | a2468d18ca39afed9102d707e7aea6a613ff2dab (patch) | |
tree | efede9c515269b6ce56b8afcf8b472a1d2dde48b /mediagoblin/tests/test_storage.py | |
parent | 55376ff403496a3271154627c45fe59dc2b44ca7 (diff) | |
download | mediagoblin-a2468d18ca39afed9102d707e7aea6a613ff2dab.tar.lz mediagoblin-a2468d18ca39afed9102d707e7aea6a613ff2dab.tar.xz mediagoblin-a2468d18ca39afed9102d707e7aea6a613ff2dab.zip |
Feature #587 - Split storage.py into submodules
* Removed storage.py
* Created submodules for filestorage, cloudfiles, mountstorage
* Changed test_storage to reflect the changes made in the storage
module structure
* Added mediagoblin.storage.filestorage.BasicFileStorage as a
default for both publicstore and queuestore's `storage_class`
Diffstat (limited to 'mediagoblin/tests/test_storage.py')
-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 |