Commit 271581df authored by Simon Charette's avatar Simon Charette
Browse files

Refs #26712 -- Removed workarounds for PostgreSQL queries on TIME_ZONE changes.

parent b484f167
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -94,9 +94,7 @@ class FileStorageDeconstructionTests(unittest.TestCase):
requires_pytz = unittest.skipIf(pytz is None, "this test requires pytz")


class FileStorageTests(TestCase):
    # Changing TIME_ZONE may issue a query to set the database's timezone,
    # hence TestCase.
class FileStorageTests(SimpleTestCase):
    storage_class = FileSystemStorage

    def setUp(self):
+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from unittest import skipIf

from django.contrib.humanize.templatetags import humanize
from django.template import Context, Template, defaultfilters
from django.test import TestCase, modify_settings, override_settings
from django.test import SimpleTestCase, modify_settings, override_settings
from django.utils import translation
from django.utils.html import escape
from django.utils.timezone import get_fixed_timezone, utc
@@ -36,7 +36,7 @@ class MockDateTime(datetime.datetime):


@modify_settings(INSTALLED_APPS={'append': 'django.contrib.humanize'})
class HumanizeTests(TestCase):
class HumanizeTests(SimpleTestCase):

    def humanize_tester(self, test_list, result_list, method, normalize_result_func=escape):
        for test_content, result in zip(test_list, result_list):
+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ from django.core.mail import (
)
from django.core.mail.backends import console, dummy, filebased, locmem, smtp
from django.core.mail.message import BadHeaderError, sanitize_address
from django.test import SimpleTestCase, TestCase, override_settings
from django.test import SimpleTestCase, override_settings
from django.test.utils import requires_tz_support
from django.utils._os import upath
from django.utils.encoding import force_bytes, force_text
@@ -607,9 +607,8 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):


@requires_tz_support
class MailTimeZoneTests(TestCase):
class MailTimeZoneTests(SimpleTestCase):

    # setting the timezone requires a database query on PostgreSQL.
    @override_settings(EMAIL_USE_LOCALTIME=False, USE_TZ=True, TIME_ZONE='Africa/Algiers')
    def test_date_header_utc(self):
        """
+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ class SerializationTests(SimpleTestCase):


@override_settings(DATETIME_FORMAT='c', TIME_ZONE='Africa/Nairobi', USE_L10N=False, USE_TZ=True)
class TemplateTests(TestCase):
class TemplateTests(SimpleTestCase):

    @requires_tz_support
    def test_localtime_templatetag_and_filters(self):