mirror of
https://github.com/django/django.git
synced 2025-06-05 11:39:13 +00:00
ticket #34699. code formatting update.
This commit is contained in:
parent
4d2bb0e10b
commit
201fb15795
@ -1952,12 +1952,12 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
|||||||
later = now + timedelta(hours=2)
|
later = now + timedelta(hours=2)
|
||||||
non_utc_model = self.create_model(now, later)
|
non_utc_model = self.create_model(now, later)
|
||||||
models_qs = DTModel.objects.annotate(
|
models_qs = DTModel.objects.annotate(
|
||||||
start_trunc=TruncSecond('start_datetime')).filter(id=non_utc_model.id,
|
start_trunc=TruncSecond('start_datetime')
|
||||||
start_trunc__lte=now)
|
).filter(id=non_utc_model.id, start_trunc__lte=now)
|
||||||
self.assertEqual(models_qs.count(), 1)
|
self.assertEqual(models_qs.count(), 1)
|
||||||
test_timezones = [
|
test_timezones = [
|
||||||
zoneinfo.ZoneInfo("Europe/Berlin"),
|
zoneinfo.ZoneInfo("Europe/Berlin"),
|
||||||
zoneinfo.ZoneInfo("Australia/Melbourne")
|
zoneinfo.ZoneInfo("Australia/Melbourne"),
|
||||||
]
|
]
|
||||||
for test_tz in test_timezones:
|
for test_tz in test_timezones:
|
||||||
with timezone.override(test_tz):
|
with timezone.override(test_tz):
|
||||||
@ -1965,14 +1965,13 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
|||||||
later = now + timedelta(hours=2)
|
later = now + timedelta(hours=2)
|
||||||
non_utc_model = self.create_model(now, later)
|
non_utc_model = self.create_model(now, later)
|
||||||
models_qs = DTModel.objects.annotate(
|
models_qs = DTModel.objects.annotate(
|
||||||
start_trunc=TruncSecond('start_datetime')).filter(
|
start_trunc=TruncSecond('start_datetime')
|
||||||
id=non_utc_model.id,
|
).filter(id=non_utc_model.id, start_trunc__lte=now)
|
||||||
start_trunc__lte=now)
|
|
||||||
self.assertNotEqual(models_qs.count(), 1)
|
self.assertNotEqual(models_qs.count(), 1)
|
||||||
adjusted_now = timezone.localtime(now).replace(
|
adjusted_now = timezone.localtime(now).replace(
|
||||||
tzinfo=zoneinfo.ZoneInfo(key='UTC'))
|
tzinfo=zoneinfo.ZoneInfo(key='UTC')
|
||||||
|
)
|
||||||
models_qs = DTModel.objects.annotate(
|
models_qs = DTModel.objects.annotate(
|
||||||
start_trunc=TruncSecond('start_datetime')).filter(
|
start_trunc=TruncSecond('start_datetime')
|
||||||
id=non_utc_model.id,
|
).filter(id=non_utc_model.id, start_trunc__lte=adjusted_now)
|
||||||
start_trunc__lte=adjusted_now)
|
|
||||||
self.assertEqual(models_qs.count(), 1)
|
self.assertEqual(models_qs.count(), 1)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user