-
Notifications
You must be signed in to change notification settings - Fork 283
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Unable to collectstatic with non-default STATICFILES_STORAGE #149
Merged
leplatrem
merged 3 commits into
makinacorpus:master
from
KostyaEsmukov:nondefault_staticfiles_storage_test
Jan 27, 2017
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
b05260f
Added failing test for non-lazy `static` templatetag calls.
KostyaEsmukov 8c14823
#149 non-lazy `static` test: reset memoized staticfiles_storage after…
KostyaEsmukov d820309
Added more comments on the failing non-default STATICFILES_STORAGE test
KostyaEsmukov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,8 @@ | |
import json | ||
|
||
import django | ||
from django.contrib.staticfiles.storage import StaticFilesStorage, staticfiles_storage | ||
from django.contrib.staticfiles.templatetags.staticfiles import static | ||
from django.test import SimpleTestCase | ||
from django.contrib.gis.db import models as gismodels | ||
|
||
|
@@ -15,6 +17,44 @@ | |
from ..forms import fields | ||
|
||
|
||
class DummyStaticFilesStorage(StaticFilesStorage): | ||
|
||
def url(self, name): | ||
raise ValueError | ||
|
||
|
||
class AppLoadingTest(SimpleTestCase): | ||
|
||
def test_init_with_non_default_staticfiles_storage(self): | ||
""" | ||
Non-default STATICFILES_STORAGE (ex. django.contrib.staticfiles.storage.ManifestStaticFilesStorage) | ||
might raise ValueError when file could not be found by this storage and DEBUG is set to False. | ||
|
||
Ensure that _normalize_plugins_config calls `static` lazily, in order to let `collectstatic` command to run. | ||
|
||
""" | ||
|
||
try: | ||
with self.settings(STATICFILES_STORAGE='leaflet.tests.tests.DummyStaticFilesStorage', STATIC_ROOT="/", DEBUG=False): | ||
staticfiles_storage._setup() # reset already initialized (and memoized) default STATICFILES_STORAGE | ||
|
||
try: | ||
static("a") | ||
self.fail("static must raise an exception") | ||
except ValueError: | ||
pass | ||
|
||
PLUGINS.update({ | ||
'a': {'css': 'a'}, | ||
}) | ||
|
||
PLUGINS.pop('__is_normalized__') | ||
_normalize_plugins_config() | ||
finally: | ||
staticfiles_storage._setup() | ||
_normalize_plugins_config() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe add some comments to explain what's expected behaviour we should have here |
||
|
||
|
||
class PluginListingTest(SimpleTestCase): | ||
|
||
def test_default_resources(self): | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
something like
self.assertRaises
instead ?