diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-10-20 01:33:24 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-10-20 01:33:24 +0000 |
| commit | cfc19f84def07fb950ae8789ed0655eae4f66a92 (patch) | |
| tree | 2c02cc5996a28f0ab900def5d804c961753c86d0 /tests/regressiontests/servers | |
| parent | a014ee02888d2fcea6880bef51f143632a60aab3 (diff) | |
Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/servers')
| -rw-r--r-- | tests/regressiontests/servers/tests.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/regressiontests/servers/tests.py b/tests/regressiontests/servers/tests.py index 47639828b0..29f169ccbd 100644 --- a/tests/regressiontests/servers/tests.py +++ b/tests/regressiontests/servers/tests.py @@ -9,6 +9,7 @@ from django.test import TestCase from django.core.handlers.wsgi import WSGIHandler from django.core.servers.basehttp import AdminMediaHandler +from django.conf import settings class AdminMediaHandlerTests(TestCase): @@ -25,7 +26,7 @@ class AdminMediaHandlerTests(TestCase): """ # Cases that should work on all platforms. data = ( - ('/media/css/base.css', ('css', 'base.css')), + ('%scss/base.css' % settings.ADMIN_MEDIA_PREFIX, ('css', 'base.css')), ) # Cases that should raise an exception. bad_data = () @@ -34,19 +35,19 @@ class AdminMediaHandlerTests(TestCase): if os.sep == '/': data += ( # URL, tuple of relative path parts. - ('/media/\\css/base.css', ('\\css', 'base.css')), + ('%s\\css/base.css' % settings.ADMIN_MEDIA_PREFIX, ('\\css', 'base.css')), ) bad_data += ( - '/media//css/base.css', - '/media////css/base.css', - '/media/../css/base.css', + '%s/css/base.css' % settings.ADMIN_MEDIA_PREFIX, + '%s///css/base.css' % settings.ADMIN_MEDIA_PREFIX, + '%s../css/base.css' % settings.ADMIN_MEDIA_PREFIX, ) elif os.sep == '\\': bad_data += ( - '/media/C:\css/base.css', - '/media//\\css/base.css', - '/media/\\css/base.css', - '/media/\\\\css/base.css' + '%sC:\css/base.css' % settings.ADMIN_MEDIA_PREFIX, + '%s/\\css/base.css' % settings.ADMIN_MEDIA_PREFIX, + '%s\\css/base.css' % settings.ADMIN_MEDIA_PREFIX, + '%s\\\\css/base.css' % settings.ADMIN_MEDIA_PREFIX ) for url, path_tuple in data: try: |