diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-19 17:39:32 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-19 17:39:32 -0500 |
| commit | 0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada (patch) | |
| tree | 7a0936a9a83f9f39a090f96e41a274ac77ddaee4 /mediagoblin/tests/test_storage.py | |
| parent | e8fda91bc2326911ea9a0197e595bc333540c282 (diff) | |
| parent | 188240e312b8c5ff50bef276c97b36e5b3835f1e (diff) | |
| download | mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.lz mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.xz mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.zip | |
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
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 55b66e84..1800c29d 100644 --- a/mediagoblin/tests/test_storage.py +++ b/mediagoblin/tests/test_storage.py @@ -58,8 +58,8 @@ class FakeRemoteStorage(storage.BasicFileStorage): local_storage = False -def test_storage_system_from_paste_config(): - this_storage = storage.storage_system_from_paste_config( +def test_storage_system_from_config(): + this_storage = storage.storage_system_from_config( {'somestorage_base_url': 'http://example.org/moodia/', 'somestorage_base_dir': '/tmp/', 'somestorage_garbage_arg': 'garbage_arg', @@ -69,7 +69,7 @@ def test_storage_system_from_paste_config(): assert this_storage.base_dir == '/tmp/' assert this_storage.__class__ is storage.BasicFileStorage - this_storage = storage.storage_system_from_paste_config( + this_storage = storage.storage_system_from_config( {'somestorage_foobie': 'eiboof', 'somestorage_blech': 'hcelb', 'somestorage_garbage_arg': 'garbage_arg', |