1
0
mirror of https://github.com/django/django.git synced 2025-10-26 23:26:08 +00:00

[1.10.x] Fixed #26896 -- Allowed a lazy base_url for FileSystemStorage.

Backport of b820b6108a from master
This commit is contained in:
Tomas Pazderka
2016-07-28 13:37:07 +02:00
committed by Tim Graham
parent 8735710def
commit d61dbc20cf
2 changed files with 12 additions and 3 deletions

View File

@@ -24,6 +24,7 @@ from django.test import (
override_settings,
)
from django.test.utils import requires_tz_support
from django.urls import NoReverseMatch, reverse_lazy
from django.utils import six, timezone
from django.utils._os import upath
from django.utils.deprecation import RemovedInDjango20Warning
@@ -73,7 +74,7 @@ class GetStorageClassTests(SimpleTestCase):
get_storage_class('django.core.files.non_existing_storage.NonExistingStorage')
class FileStorageDeconstructionTests(unittest.TestCase):
class FileSystemStorageTests(unittest.TestCase):
def test_deconstruction(self):
path, args, kwargs = temp_storage.deconstruct()
@@ -89,6 +90,14 @@ class FileStorageDeconstructionTests(unittest.TestCase):
path, args, kwargs = storage.deconstruct()
self.assertEqual(kwargs, kwargs_orig)
def test_lazy_base_url_init(self):
"""
FileSystemStorage.__init__() shouldn't evaluate base_url.
"""
storage = FileSystemStorage(base_url=reverse_lazy('app:url'))
with self.assertRaises(NoReverseMatch):
storage.url(storage.base_url)
# Tests for TZ-aware time methods need pytz.
requires_pytz = unittest.skipIf(pytz is None, "this test requires pytz")