mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Refs #32365 -- Removed internal uses of utils.timezone.utc alias.
Remaining test case ensures that uses of the alias are mapped canonically by the migration writer.
This commit is contained in:
committed by
Mariusz Felisiak
parent
1cf60ce601
commit
bb61f0186d
@@ -4,7 +4,6 @@ from unittest import mock
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
from django.test import TestCase, override_settings, skipUnlessDBFeature
|
||||
from django.test.utils import requires_tz_support
|
||||
from django.utils import timezone
|
||||
|
||||
from .models import Artist, Author, Book, BookSigning, Page
|
||||
|
||||
@@ -157,7 +156,9 @@ class ArchiveIndexViewTests(TestDataMixin, TestCase):
|
||||
@override_settings(USE_TZ=True, TIME_ZONE="Africa/Nairobi")
|
||||
def test_aware_datetime_archive_view(self):
|
||||
BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 4, 2, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
res = self.client.get("/dates/booksignings/")
|
||||
self.assertEqual(res.status_code, 200)
|
||||
@@ -344,7 +345,9 @@ class YearArchiveViewTests(TestDataMixin, TestCase):
|
||||
@override_settings(USE_TZ=True, TIME_ZONE="Africa/Nairobi")
|
||||
def test_aware_datetime_year_view(self):
|
||||
BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 4, 2, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
res = self.client.get("/dates/booksignings/2008/")
|
||||
self.assertEqual(res.status_code, 200)
|
||||
@@ -517,13 +520,19 @@ class MonthArchiveViewTests(TestDataMixin, TestCase):
|
||||
@override_settings(USE_TZ=True, TIME_ZONE="Africa/Nairobi")
|
||||
def test_aware_datetime_month_view(self):
|
||||
BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 2, 1, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 2, 1, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 4, 2, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 6, 3, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 6, 3, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
res = self.client.get("/dates/booksignings/2008/apr/")
|
||||
self.assertEqual(res.status_code, 200)
|
||||
@@ -664,7 +673,9 @@ class WeekArchiveViewTests(TestDataMixin, TestCase):
|
||||
@override_settings(USE_TZ=True, TIME_ZONE="Africa/Nairobi")
|
||||
def test_aware_datetime_week_view(self):
|
||||
BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 4, 2, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
res = self.client.get("/dates/booksignings/2008/week/13/")
|
||||
self.assertEqual(res.status_code, 200)
|
||||
@@ -794,19 +805,25 @@ class DayArchiveViewTests(TestDataMixin, TestCase):
|
||||
@override_settings(USE_TZ=True, TIME_ZONE="Africa/Nairobi")
|
||||
def test_aware_datetime_day_view(self):
|
||||
bs = BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 4, 2, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
res = self.client.get("/dates/booksignings/2008/apr/2/")
|
||||
self.assertEqual(res.status_code, 200)
|
||||
# 2008-04-02T00:00:00+03:00 (beginning of day) >
|
||||
# 2008-04-01T22:00:00+00:00 (book signing event date).
|
||||
bs.event_date = datetime.datetime(2008, 4, 1, 22, 0, tzinfo=timezone.utc)
|
||||
bs.event_date = datetime.datetime(
|
||||
2008, 4, 1, 22, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
bs.save()
|
||||
res = self.client.get("/dates/booksignings/2008/apr/2/")
|
||||
self.assertEqual(res.status_code, 200)
|
||||
# 2008-04-03T00:00:00+03:00 (end of day) > 2008-04-02T22:00:00+00:00
|
||||
# (book signing event date).
|
||||
bs.event_date = datetime.datetime(2008, 4, 2, 22, 0, tzinfo=timezone.utc)
|
||||
bs.event_date = datetime.datetime(
|
||||
2008, 4, 2, 22, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
bs.save()
|
||||
res = self.client.get("/dates/booksignings/2008/apr/2/")
|
||||
self.assertEqual(res.status_code, 404)
|
||||
@@ -897,19 +914,25 @@ class DateDetailViewTests(TestDataMixin, TestCase):
|
||||
@override_settings(USE_TZ=True, TIME_ZONE="Africa/Nairobi")
|
||||
def test_aware_datetime_date_detail(self):
|
||||
bs = BookSigning.objects.create(
|
||||
event_date=datetime.datetime(2008, 4, 2, 12, 0, tzinfo=timezone.utc)
|
||||
event_date=datetime.datetime(
|
||||
2008, 4, 2, 12, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
)
|
||||
res = self.client.get("/dates/booksignings/2008/apr/2/%d/" % bs.pk)
|
||||
self.assertEqual(res.status_code, 200)
|
||||
# 2008-04-02T00:00:00+03:00 (beginning of day) >
|
||||
# 2008-04-01T22:00:00+00:00 (book signing event date).
|
||||
bs.event_date = datetime.datetime(2008, 4, 1, 22, 0, tzinfo=timezone.utc)
|
||||
bs.event_date = datetime.datetime(
|
||||
2008, 4, 1, 22, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
bs.save()
|
||||
res = self.client.get("/dates/booksignings/2008/apr/2/%d/" % bs.pk)
|
||||
self.assertEqual(res.status_code, 200)
|
||||
# 2008-04-03T00:00:00+03:00 (end of day) > 2008-04-02T22:00:00+00:00
|
||||
# (book signing event date).
|
||||
bs.event_date = datetime.datetime(2008, 4, 2, 22, 0, tzinfo=timezone.utc)
|
||||
bs.event_date = datetime.datetime(
|
||||
2008, 4, 2, 22, 0, tzinfo=datetime.timezone.utc
|
||||
)
|
||||
bs.save()
|
||||
res = self.client.get("/dates/booksignings/2008/apr/2/%d/" % bs.pk)
|
||||
self.assertEqual(res.status_code, 404)
|
||||
|
||||
Reference in New Issue
Block a user