summaryrefslogtreecommitdiff
path: root/tests/staticfiles_tests
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2021-02-05 18:41:49 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-02-06 13:41:35 +0100
commit50a5f8840fa564dcefdb1fa5c58f06fcd472ee70 (patch)
tree7a5bce946fceb84a0173478364d76275a7359e2b /tests/staticfiles_tests
parent9d05add447d57d94ec9e9b3daa338d85a29fe083 (diff)
downloaddjango-50a5f8840fa564dcefdb1fa5c58f06fcd472ee70.tar.gz
Refs #32394 -- Changed STATIC_URL/MEDIA_URL to relative paths in tests and docs where appropriate.
Diffstat (limited to 'tests/staticfiles_tests')
-rw-r--r--tests/staticfiles_tests/settings.py4
-rw-r--r--tests/staticfiles_tests/test_liveserver.py4
-rw-r--r--tests/staticfiles_tests/test_utils.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/staticfiles_tests/settings.py b/tests/staticfiles_tests/settings.py
index 444450358f..3bd581824d 100644
--- a/tests/staticfiles_tests/settings.py
+++ b/tests/staticfiles_tests/settings.py
@@ -4,8 +4,8 @@ from pathlib import Path
TEST_ROOT = os.path.dirname(__file__)
TEST_SETTINGS = {
- 'MEDIA_URL': '/media/',
- 'STATIC_URL': '/static/',
+ 'MEDIA_URL': 'media/',
+ 'STATIC_URL': 'static/',
'MEDIA_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'media'),
'STATIC_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'static'),
'STATICFILES_DIRS': [
diff --git a/tests/staticfiles_tests/test_liveserver.py b/tests/staticfiles_tests/test_liveserver.py
index 820fa5bc89..eb027f7341 100644
--- a/tests/staticfiles_tests/test_liveserver.py
+++ b/tests/staticfiles_tests/test_liveserver.py
@@ -13,8 +13,8 @@ from django.test import modify_settings, override_settings
TEST_ROOT = os.path.dirname(__file__)
TEST_SETTINGS = {
- 'MEDIA_URL': '/media/',
- 'STATIC_URL': '/static/',
+ 'MEDIA_URL': 'media/',
+ 'STATIC_URL': 'static/',
'MEDIA_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'media'),
'STATIC_ROOT': os.path.join(TEST_ROOT, 'project', 'site_media', 'static'),
}
diff --git a/tests/staticfiles_tests/test_utils.py b/tests/staticfiles_tests/test_utils.py
index 4610b7f00f..2fe7344646 100644
--- a/tests/staticfiles_tests/test_utils.py
+++ b/tests/staticfiles_tests/test_utils.py
@@ -5,7 +5,7 @@ from django.test import SimpleTestCase, override_settings
class CheckSettingsTests(SimpleTestCase):
- @override_settings(DEBUG=True, MEDIA_URL='/static/media/', STATIC_URL='/static/',)
+ @override_settings(DEBUG=True, MEDIA_URL='static/media/', STATIC_URL='static/')
def test_media_url_in_static_url(self):
msg = "runserver can't serve media if MEDIA_URL is within STATIC_URL."
with self.assertRaisesMessage(ImproperlyConfigured, msg):