diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-02-14 01:42:26 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-02-14 01:42:26 +0000 |
| commit | a26034ffbf8951276b79ccb298423bc809246637 (patch) | |
| tree | dfce8ec7131c5c77a755f02fc2b5c83f215e9815 /tests | |
| parent | 6b1191b1a2cecb48661d476b3a7f17e17c0d819c (diff) | |
Fixes #15270 -- Moved back the serve view to django.views.static due to dependency conflicts with the contrib app staticfiles (reverts parts of r14293). Added a helper function that generates URL patterns for serving static and media files during development. Thanks to Carl for reviewing the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regressiontests/staticfiles_tests/tests.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py index d524254f3c..0ceb11bafd 100644 --- a/tests/regressiontests/staticfiles_tests/tests.py +++ b/tests/regressiontests/staticfiles_tests/tests.py @@ -293,9 +293,8 @@ class TestServeDisabled(TestServeStatic): settings.DEBUG = False def test_disabled_serving(self): - self.assertRaisesRegexp(ImproperlyConfigured, 'The view to serve ' - 'static files can only be used if the DEBUG setting is True', - self._response, 'test.txt') + self.assertRaisesRegexp(ImproperlyConfigured, 'The staticfiles view ' + 'can only be used in debug mode ', self._response, 'test.txt') class TestServeStaticWithDefaultURL(TestServeStatic, TestDefaults): |