summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-02-21 17:49:52 +0100
committerTim Graham <timograham@gmail.com>2015-02-21 13:08:15 -0500
commit481d3bd617d497506d5d4127f60583a03c00ee42 (patch)
tree29c75dd7bb12f1817edfa1af5a8c58c983cf4a87
parent82e323167d3f223e9eeda87857092d6c4c8fa026 (diff)
[1.8.x] Removed obsolete reference to media directory.
Backport of 787dd6519a791f210dc8275eaf2fd41454bf9670 from master
-rw-r--r--tests/staticfiles_tests/apps/test/static/test/file.txt2
-rw-r--r--tests/staticfiles_tests/test_liveserver.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/staticfiles_tests/apps/test/static/test/file.txt b/tests/staticfiles_tests/apps/test/static/test/file.txt
index 169a206488..f4754f7310 100644
--- a/tests/staticfiles_tests/apps/test/static/test/file.txt
+++ b/tests/staticfiles_tests/apps/test/static/test/file.txt
@@ -1 +1 @@
-In app media directory.
+In static directory.
diff --git a/tests/staticfiles_tests/test_liveserver.py b/tests/staticfiles_tests/test_liveserver.py
index 58b96b69ec..b6dfc767e7 100644
--- a/tests/staticfiles_tests/test_liveserver.py
+++ b/tests/staticfiles_tests/test_liveserver.py
@@ -95,4 +95,4 @@ class StaticLiveServerView(LiveServerBase):
to discover app's static assets without having to collectstatic first.
"""
f = self.urlopen('/static/test/file.txt')
- self.assertEqual(f.read().rstrip(b'\r\n'), b'In app media directory.')
+ self.assertEqual(f.read().rstrip(b'\r\n'), b'In static directory.')