aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-04-16 12:47:15 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-04-16 12:47:15 -0500
commit01da9e6a0e2f688940da497b48d2222c6e4546a6 (patch)
tree98a8a216416d156c8689f5eea5d3421b7f03fbd5
parentf61a41b89d9143b23661e7e9b0ed5cef7d85a413 (diff)
downloadmediagoblin-01da9e6a0e2f688940da497b48d2222c6e4546a6.tar.lz
mediagoblin-01da9e6a0e2f688940da497b48d2222c6e4546a6.tar.xz
mediagoblin-01da9e6a0e2f688940da497b48d2222c6e4546a6.zip
Test for BasicFileStorage.file_url()
-rw-r--r--mediagoblin/tests/test_storage.py22
1 files changed, 21 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py
index 6a73cd82..0db9df84 100644
--- a/mediagoblin/tests/test_storage.py
+++ b/mediagoblin/tests/test_storage.py
@@ -159,4 +159,24 @@ def test_basic_storage_delete_file():
def test_basic_storage_url_for_file():
- pass
+ # Not supplying a base_url should actually just bork.
+ tmpdir, this_storage = get_tmp_filestorage()
+ assert_raises(
+ storage.NoWebServing,
+ this_storage.file_url,
+ ['dir1', 'dir2', 'filename.txt'])
+
+ # base_url without domain
+ tmpdir, this_storage = get_tmp_filestorage('/media/')
+ result = this_storage.file_url(
+ ['dir1', 'dir2', 'filename.txt'])
+ expected = '/media/dir1/dir2/filename.txt'
+ assert result == expected
+
+ # base_url with domain
+ tmpdir, this_storage = get_tmp_filestorage(
+ 'http://media.example.org/ourmedia/')
+ result = this_storage.file_url(
+ ['dir1', 'dir2', 'filename.txt'])
+ expected = 'http://media.example.org/ourmedia/dir1/dir2/filename.txt'
+ assert result == expected