summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAksel Ethem <aksel.ethem@gmail.com>2015-03-12 12:19:42 +0100
committerTim Graham <timograham@gmail.com>2015-03-12 09:23:57 -0400
commitfee18ce415cd817c20f64009600b0c7158353974 (patch)
treed5868bf806e041fbf754caa81e423d6f79147c9b
parentdef39428bff977d862c0c3b36a84c870b2f14908 (diff)
[1.8.x] Fixed #24364 -- Doc'ed that ManifestStaticFileStorage shouldn't be used during testing.
Backport of b4d8b16e5109170614ba505e36f60c2ad64dafc2 from master
-rw-r--r--AUTHORS1
-rw-r--r--docs/ref/contrib/staticfiles.txt6
2 files changed, 7 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 1eee10dabb..bc9b71deb8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ answer newbie questions, and generally made Django that much better:
Ahmad Al-Ibrahim
ajs <adi@sieker.info>
Akis Kesoglou <akiskesoglou@gmail.com>
+ Aksel Ethem <aksel.ethem@gmail.com>
alang@bright-green.com
Alasdair Nicol <http://al.sdair.co.uk/>
Albert Wang <aywang31@gmail.com>
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index 57f35877d7..b728632671 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -298,6 +298,12 @@ hashed names for all processed files in a file called ``staticfiles.json``.
This happens once when you run the :djadmin:`collectstatic` management
command.
+Due to the requirement of running :djadmin:`collectstatic`, this storage
+typically shouldn't be used when running tests as ``collectstatic`` isn't run
+as part of the normal test setup. During testing, ensure that the
+:setting:`STATICFILES_STORAGE` setting is set to something else like
+``'django.contrib.staticfiles.storage.StaticFilesStorage'`` (the default).
+
.. method:: storage.ManifestStaticFilesStorage.file_hash(name, content=None)
The method that is used when creating the hashed name of a file.