diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-20 16:33:14 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-20 16:33:14 +0200 |
| commit | 2d1f91cc41aca908502ea1d18687b902a5fd90a1 (patch) | |
| tree | 1d6d425a8ec7a7bfb8490c88d87806d856336d1e /mediagoblin/tests/test_storage.py | |
| parent | 76e21adbd8756159d83bef99b335398519b338f3 (diff) | |
| parent | 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff) | |
| download | mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.lz mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.xz mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.zip | |
Merge remote-tracking branch 'gitorious/master'
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', |