1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Refs #33476 -- Reformatted code with Black.

This commit is contained in:
django-bot
2022-02-03 20:24:19 +01:00
committed by Mariusz Felisiak
parent f68fa8b45d
commit 9c19aff7c7
1992 changed files with 139577 additions and 96284 deletions

View File

@@ -12,19 +12,17 @@ from django.core import checks
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.db.models.signals import post_migrate
from django.http import HttpRequest, HttpResponse
from django.test import (
SimpleTestCase, TestCase, modify_settings, override_settings,
)
from django.test import SimpleTestCase, TestCase, modify_settings, override_settings
from django.test.utils import captured_stdout
@modify_settings(INSTALLED_APPS={'append': 'django.contrib.sites'})
@modify_settings(INSTALLED_APPS={"append": "django.contrib.sites"})
class SitesFrameworkTests(TestCase):
databases = {'default', 'other'}
databases = {"default", "other"}
@classmethod
def setUpTestData(cls):
cls.site = Site(id=settings.SITE_ID, domain='example.com', name='example.com')
cls.site = Site(id=settings.SITE_ID, domain="example.com", name="example.com")
cls.site.save()
def setUp(self):
@@ -60,7 +58,7 @@ class SitesFrameworkTests(TestCase):
with self.assertRaises(Site.DoesNotExist):
Site.objects.get_current()
@override_settings(ALLOWED_HOSTS=['example.com'])
@override_settings(ALLOWED_HOSTS=["example.com"])
def test_get_current_site(self):
# The correct Site object is returned
request = HttpRequest()
@@ -79,12 +77,12 @@ class SitesFrameworkTests(TestCase):
get_current_site(request)
# A RequestSite is returned if the sites framework is not installed
with self.modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'}):
with self.modify_settings(INSTALLED_APPS={"remove": "django.contrib.sites"}):
site = get_current_site(request)
self.assertIsInstance(site, RequestSite)
self.assertEqual(site.name, "example.com")
@override_settings(SITE_ID=None, ALLOWED_HOSTS=['example.com'])
@override_settings(SITE_ID=None, ALLOWED_HOSTS=["example.com"])
def test_get_current_site_no_site_id(self):
request = HttpRequest()
request.META = {
@@ -95,54 +93,54 @@ class SitesFrameworkTests(TestCase):
site = get_current_site(request)
self.assertEqual(site.name, "example.com")
@override_settings(SITE_ID=None, ALLOWED_HOSTS=['example.com'])
@override_settings(SITE_ID=None, ALLOWED_HOSTS=["example.com"])
def test_get_current_site_host_with_trailing_dot(self):
"""
The site is matched if the name in the request has a trailing dot.
"""
request = HttpRequest()
request.META = {
'SERVER_NAME': 'example.com.',
'SERVER_PORT': '80',
"SERVER_NAME": "example.com.",
"SERVER_PORT": "80",
}
site = get_current_site(request)
self.assertEqual(site.name, 'example.com')
self.assertEqual(site.name, "example.com")
@override_settings(SITE_ID=None, ALLOWED_HOSTS=['example.com', 'example.net'])
@override_settings(SITE_ID=None, ALLOWED_HOSTS=["example.com", "example.net"])
def test_get_current_site_no_site_id_and_handle_port_fallback(self):
request = HttpRequest()
s1 = self.site
s2 = Site.objects.create(domain='example.com:80', name='example.com:80')
s2 = Site.objects.create(domain="example.com:80", name="example.com:80")
# Host header without port
request.META = {'HTTP_HOST': 'example.com'}
request.META = {"HTTP_HOST": "example.com"}
site = get_current_site(request)
self.assertEqual(site, s1)
# Host header with port - match, no fallback without port
request.META = {'HTTP_HOST': 'example.com:80'}
request.META = {"HTTP_HOST": "example.com:80"}
site = get_current_site(request)
self.assertEqual(site, s2)
# Host header with port - no match, fallback without port
request.META = {'HTTP_HOST': 'example.com:81'}
request.META = {"HTTP_HOST": "example.com:81"}
site = get_current_site(request)
self.assertEqual(site, s1)
# Host header with non-matching domain
request.META = {'HTTP_HOST': 'example.net'}
request.META = {"HTTP_HOST": "example.net"}
with self.assertRaises(ObjectDoesNotExist):
get_current_site(request)
# Ensure domain for RequestSite always matches host header
with self.modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'}):
request.META = {'HTTP_HOST': 'example.com'}
with self.modify_settings(INSTALLED_APPS={"remove": "django.contrib.sites"}):
request.META = {"HTTP_HOST": "example.com"}
site = get_current_site(request)
self.assertEqual(site.name, 'example.com')
self.assertEqual(site.name, "example.com")
request.META = {'HTTP_HOST': 'example.com:80'}
request.META = {"HTTP_HOST": "example.com:80"}
site = get_current_site(request)
self.assertEqual(site.name, 'example.com:80')
self.assertEqual(site.name, "example.com:80")
def test_domain_name_with_whitespaces(self):
# Regression for #17320
@@ -157,7 +155,7 @@ class SitesFrameworkTests(TestCase):
with self.assertRaises(ValidationError):
site.full_clean()
@override_settings(ALLOWED_HOSTS=['example.com'])
@override_settings(ALLOWED_HOSTS=["example.com"])
def test_clear_site_cache(self):
request = HttpRequest()
request.META = {
@@ -175,12 +173,12 @@ class SitesFrameworkTests(TestCase):
expected_cache.update({self.site.domain: self.site})
self.assertEqual(models.SITE_CACHE, expected_cache)
clear_site_cache(Site, instance=self.site, using='default')
clear_site_cache(Site, instance=self.site, using="default")
self.assertEqual(models.SITE_CACHE, {})
@override_settings(SITE_ID=None, ALLOWED_HOSTS=['example2.com'])
@override_settings(SITE_ID=None, ALLOWED_HOSTS=["example2.com"])
def test_clear_site_cache_domain(self):
site = Site.objects.create(name='example2.com', domain='example2.com')
site = Site.objects.create(name="example2.com", domain="example2.com")
request = HttpRequest()
request.META = {
"SERVER_NAME": "example2.com",
@@ -191,15 +189,15 @@ class SitesFrameworkTests(TestCase):
self.assertEqual(models.SITE_CACHE, expected_cache)
# Site exists in 'default' database so using='other' shouldn't clear.
clear_site_cache(Site, instance=site, using='other')
clear_site_cache(Site, instance=site, using="other")
self.assertEqual(models.SITE_CACHE, expected_cache)
# using='default' should clear.
clear_site_cache(Site, instance=site, using='default')
clear_site_cache(Site, instance=site, using="default")
self.assertEqual(models.SITE_CACHE, {})
def test_unique_domain(self):
site = Site(domain=self.site.domain)
msg = 'Site with this Domain name already exists.'
msg = "Site with this Domain name already exists."
with self.assertRaisesMessage(ValidationError, msg):
site.validate_unique()
@@ -207,14 +205,17 @@ class SitesFrameworkTests(TestCase):
self.assertEqual(Site.objects.get_by_natural_key(self.site.domain), self.site)
self.assertEqual(self.site.natural_key(), (self.site.domain,))
@override_settings(SITE_ID='1')
@override_settings(SITE_ID="1")
def test_check_site_id(self):
self.assertEqual(check_site_id(None), [
checks.Error(
msg='The SITE_ID setting must be an integer',
id='sites.E101',
),
])
self.assertEqual(
check_site_id(None),
[
checks.Error(
msg="The SITE_ID setting must be an integer",
id="sites.E101",
),
],
)
def test_valid_site_id(self):
for site_id in [1, None]:
@@ -222,40 +223,39 @@ class SitesFrameworkTests(TestCase):
self.assertEqual(check_site_id(None), [])
@override_settings(ALLOWED_HOSTS=['example.com'])
@override_settings(ALLOWED_HOSTS=["example.com"])
class RequestSiteTests(SimpleTestCase):
def setUp(self):
request = HttpRequest()
request.META = {'HTTP_HOST': 'example.com'}
request.META = {"HTTP_HOST": "example.com"}
self.site = RequestSite(request)
def test_init_attributes(self):
self.assertEqual(self.site.domain, 'example.com')
self.assertEqual(self.site.name, 'example.com')
self.assertEqual(self.site.domain, "example.com")
self.assertEqual(self.site.name, "example.com")
def test_str(self):
self.assertEqual(str(self.site), 'example.com')
self.assertEqual(str(self.site), "example.com")
def test_save(self):
msg = 'RequestSite cannot be saved.'
msg = "RequestSite cannot be saved."
with self.assertRaisesMessage(NotImplementedError, msg):
self.site.save()
def test_delete(self):
msg = 'RequestSite cannot be deleted.'
msg = "RequestSite cannot be deleted."
with self.assertRaisesMessage(NotImplementedError, msg):
self.site.delete()
class JustOtherRouter:
def allow_migrate(self, db, app_label, **hints):
return db == 'other'
return db == "other"
@modify_settings(INSTALLED_APPS={'append': 'django.contrib.sites'})
@modify_settings(INSTALLED_APPS={"append": "django.contrib.sites"})
class CreateDefaultSiteTests(TestCase):
databases = {'default', 'other'}
databases = {"default", "other"}
@classmethod
def setUpTestData(cls):
@@ -263,7 +263,7 @@ class CreateDefaultSiteTests(TestCase):
Site.objects.all().delete()
def setUp(self):
self.app_config = apps.get_app_config('sites')
self.app_config = apps.get_app_config("sites")
def test_basic(self):
"""
@@ -285,16 +285,16 @@ class CreateDefaultSiteTests(TestCase):
"""
#16353, #16828 - The default site creation should respect db routing.
"""
create_default_site(self.app_config, using='default', verbosity=0)
create_default_site(self.app_config, using='other', verbosity=0)
self.assertFalse(Site.objects.using('default').exists())
self.assertTrue(Site.objects.using('other').exists())
create_default_site(self.app_config, using="default", verbosity=0)
create_default_site(self.app_config, using="other", verbosity=0)
self.assertFalse(Site.objects.using("default").exists())
self.assertTrue(Site.objects.using("other").exists())
def test_multi_db(self):
create_default_site(self.app_config, using='default', verbosity=0)
create_default_site(self.app_config, using='other', verbosity=0)
self.assertTrue(Site.objects.using('default').exists())
self.assertTrue(Site.objects.using('other').exists())
create_default_site(self.app_config, using="default", verbosity=0)
create_default_site(self.app_config, using="other", verbosity=0)
self.assertTrue(Site.objects.using("default").exists())
self.assertTrue(Site.objects.using("other").exists())
def test_save_another(self):
"""
@@ -306,14 +306,16 @@ class CreateDefaultSiteTests(TestCase):
for automatic primary keys such as PostgreSQL and Oracle.
"""
create_default_site(self.app_config, verbosity=0)
Site(domain='example2.com', name='example2.com').save()
Site(domain="example2.com", name="example2.com").save()
def test_signal(self):
"""
#23641 - Sending the ``post_migrate`` signal triggers creation of the
default site.
"""
post_migrate.send(sender=self.app_config, app_config=self.app_config, verbosity=0)
post_migrate.send(
sender=self.app_config, app_config=self.app_config, verbosity=0
)
self.assertTrue(Site.objects.exists())
@override_settings(SITE_ID=35696)
@@ -346,5 +348,6 @@ class MiddlewareTest(TestCase):
def test_request(self):
def get_response(request):
return HttpResponse(str(request.site.id))
response = CurrentSiteMiddleware(get_response)(HttpRequest())
self.assertContains(response, settings.SITE_ID)