From 50a5f8840fa564dcefdb1fa5c58f06fcd472ee70 Mon Sep 17 00:00:00 2001
From: Markus Holtermann <info@markusholtermann.eu>
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/asgi/tests.py                              | 2 +-
 tests/runtests.py                                | 2 +-
 tests/servers/tests.py                           | 4 ++--
 tests/staticfiles_tests/settings.py              | 4 ++--
 tests/staticfiles_tests/test_liveserver.py       | 4 ++--
 tests/staticfiles_tests/test_utils.py            | 2 +-
 tests/template_tests/syntax_tests/test_static.py | 2 +-
 tests/view_tests/tests/test_static.py            | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/asgi/tests.py b/tests/asgi/tests.py
index 68e242faa7..3509bb0aa7 100644
--- a/tests/asgi/tests.py
+++ b/tests/asgi/tests.py
@@ -97,7 +97,7 @@ class ASGITest(SimpleTestCase):
 
     @modify_settings(INSTALLED_APPS={'append': 'django.contrib.staticfiles'})
     @override_settings(
-        STATIC_URL='/static/',
+        STATIC_URL='static/',
         STATIC_ROOT=TEST_STATIC_ROOT,
         STATICFILES_DIRS=[TEST_STATIC_ROOT],
         STATICFILES_FINDERS=[
diff --git a/tests/runtests.py b/tests/runtests.py
index 870711370d..4cd16809c4 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -159,7 +159,7 @@ def setup(verbosity, test_labels, parallel, start_at, start_after):
     # Redirect some settings for the duration of these tests.
     settings.INSTALLED_APPS = ALWAYS_INSTALLED_APPS
     settings.ROOT_URLCONF = 'urls'
-    settings.STATIC_URL = '/static/'
+    settings.STATIC_URL = 'static/'
     settings.STATIC_ROOT = os.path.join(TMPDIR, 'static')
     settings.TEMPLATES = [{
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
diff --git a/tests/servers/tests.py b/tests/servers/tests.py
index a586b82aeb..8183d5dbf5 100644
--- a/tests/servers/tests.py
+++ b/tests/servers/tests.py
@@ -17,9 +17,9 @@ from .models import Person
 
 TEST_ROOT = os.path.dirname(__file__)
 TEST_SETTINGS = {
-    'MEDIA_URL': '/media/',
+    'MEDIA_URL': 'media/',
     'MEDIA_ROOT': os.path.join(TEST_ROOT, 'media'),
-    'STATIC_URL': '/static/',
+    'STATIC_URL': 'static/',
     'STATIC_ROOT': os.path.join(TEST_ROOT, 'static'),
 }
 
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):
diff --git a/tests/template_tests/syntax_tests/test_static.py b/tests/template_tests/syntax_tests/test_static.py
index 00f8cdbc11..6f4908ac2c 100644
--- a/tests/template_tests/syntax_tests/test_static.py
+++ b/tests/template_tests/syntax_tests/test_static.py
@@ -7,7 +7,7 @@ from django.test import SimpleTestCase, override_settings
 from ..utils import setup
 
 
-@override_settings(INSTALLED_APPS=[], MEDIA_URL='/media/', STATIC_URL='/static/')
+@override_settings(INSTALLED_APPS=[], MEDIA_URL='media/', STATIC_URL='static/')
 class StaticTagTests(SimpleTestCase):
     libraries = {'static': 'django.templatetags.static'}
 
diff --git a/tests/view_tests/tests/test_static.py b/tests/view_tests/tests/test_static.py
index 5044aca2d6..a5e811e5d6 100644
--- a/tests/view_tests/tests/test_static.py
+++ b/tests/view_tests/tests/test_static.py
@@ -142,7 +142,7 @@ class StaticHelperTest(StaticTests):
     def setUp(self):
         super().setUp()
         self._old_views_urlpatterns = urls.urlpatterns[:]
-        urls.urlpatterns += static('/media/', document_root=media_dir)
+        urls.urlpatterns += static('media/', document_root=media_dir)
 
     def tearDown(self):
         super().tearDown()
-- 
cgit v1.3