From 50a5f8840fa564dcefdb1fa5c58f06fcd472ee70 Mon Sep 17 00:00:00 2001 From: Markus Holtermann Date: Fri, 5 Feb 2021 18:41:49 +0100 Subject: Refs #32394 -- Changed STATIC_URL/MEDIA_URL to relative paths in tests and docs where appropriate. --- tests/staticfiles_tests/settings.py | 4 ++-- tests/staticfiles_tests/test_liveserver.py | 4 ++-- tests/staticfiles_tests/test_utils.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/staticfiles_tests') 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): -- cgit v1.3