misc: fix failing tests at midnigth (#75589)
gitea/chrono/pipeline/head This commit looks good Details

This commit is contained in:
Lauréline Guérin 2023-04-19 00:20:36 +02:00
parent 41df2c58a5
commit 3c25b09fa0
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
6 changed files with 14 additions and 13 deletions

View File

@ -1659,7 +1659,7 @@ class Event(models.Model):
return True
def is_day_past(self):
return self.start_datetime.date() <= now().date()
return localtime(self.start_datetime).date() <= localtime(now()).date()
@staticmethod
def annotate_queryset_for_user(qs, user_external_id, with_status=False):

View File

@ -2539,7 +2539,8 @@ class EventCheckView(ViewableAgendaMixin, DetailView):
queryset = super().get_queryset()
queryset = Event.annotate_booking_checks(queryset)
return queryset.filter(
Q(start_datetime__date__lte=now().date()) | Q(agenda__enable_check_for_future_events=True),
Q(start_datetime__date__lte=localtime(now()).date())
| Q(agenda__enable_check_for_future_events=True),
agenda=self.agenda,
cancelled=False,
)

View File

@ -14,8 +14,8 @@ def test_subscribed_with_dates():
Subscription.objects.create(
agenda=agenda,
user_external_id='xxx',
date_start=now(),
date_end=now() + datetime.timedelta(days=30),
date_start=now().date(),
date_end=now().date() + datetime.timedelta(days=30),
)
serializer = AgendaOrSubscribedSlugsSerializer(

View File

@ -1261,7 +1261,7 @@ def test_agenda_events_day_view(app, admin_user):
def test_agenda_events_day_view_midnight(app, admin_user):
agenda = Agenda.objects.create(label='Events', kind='events', default_view='day')
midnight = localtime(now().replace(day=11, month=11, year=2020)).replace(hour=0, minute=0)
midnight = make_aware(datetime.datetime(2020, 11, 11, 0, 0))
Event.objects.create(label='xyz', start_datetime=midnight, places=10, agenda=agenda)
login(app)
@ -1354,7 +1354,7 @@ def test_agenda_events_week_view(app, admin_user):
def test_agenda_events_week_view_midnight(app, admin_user):
agenda = Agenda.objects.create(label='Events', kind='events', default_view='day')
midnight = localtime(now().replace(day=1, month=11, year=2020)).replace(hour=0, minute=0)
midnight = make_aware(datetime.datetime(2020, 11, 1, 0, 0))
Event.objects.create(label='xyz', start_datetime=midnight, places=10, agenda=agenda)
login(app)
@ -1458,7 +1458,7 @@ def test_agenda_events_month_view(app, admin_user):
def test_agenda_events_month_view_midnight(app, admin_user):
agenda = Agenda.objects.create(label='Events', kind='events', default_view='day')
midnight = localtime(now().replace(day=1, month=11, year=2020)).replace(hour=0, minute=0)
midnight = make_aware(datetime.datetime(2020, 11, 1, 0, 0))
Event.objects.create(label='xyz', start_datetime=midnight, places=10, agenda=agenda)
login(app)
@ -2501,7 +2501,7 @@ def test_virtual_agenda_day_view(app, admin_user, manager_user):
desk1 = Desk.objects.create(agenda=real_agenda_1, label='New Desk')
desk2 = Desk.objects.create(agenda=real_agenda_2, label='New Desk')
today = datetime.date.today()
today = now().date()
meetingtype1 = MeetingType.objects.create(agenda=real_agenda_1, label='Bar', duration=30)
meetingtype2 = MeetingType.objects.create(agenda=real_agenda_2, label='Bar', duration=30)

View File

@ -671,7 +671,7 @@ def test_delete_busy_event(app, admin_user):
def test_delete_recurring_event(app, admin_user, freezer):
agenda = Agenda.objects.create(label='Foo bar', kind='events')
Desk.objects.create(agenda=agenda, slug='_exceptions_holder')
start_datetime = now() + datetime.timedelta(days=10)
start_datetime = now().replace(hour=10) + datetime.timedelta(days=10)
event = Event.objects.create(
start_datetime=start_datetime,
places=10,
@ -1681,7 +1681,7 @@ def test_event_checked(app, admin_user):
Desk.objects.create(agenda=agenda, slug='_exceptions_holder')
event = Event.objects.create(
label='xyz',
start_datetime=now() - datetime.timedelta(days=1),
start_datetime=localtime(now()) - datetime.timedelta(days=1),
places=10,
agenda=agenda,
)
@ -1749,7 +1749,7 @@ def test_event_checked(app, admin_user):
agenda.disable_check_update = False
agenda.save()
assert agenda.enable_check_for_future_events is False
event.start_datetime = now() + datetime.timedelta(days=1)
event.start_datetime = localtime(now()) + datetime.timedelta(days=1)
event.save()
app.post(
'/manage/agendas/%s/events/%s/checked' % (agenda.pk, event.pk),

View File

@ -81,7 +81,7 @@ def test_resource_redirect(app, admin_user):
def test_resource_day_view(app, admin_user):
today = datetime.date.today()
today = now().date()
resource = Resource.objects.create(label='Foo bar')
agenda = Agenda.objects.create(label='Agenda', kind='meetings')
desk = Desk.objects.create(agenda=agenda, label='Desk')
@ -957,7 +957,7 @@ def test_meetings_agenda_resources(app, admin_user):
def test_agenda_day_month_view_backoffice_url_translation(
app, admin_user, manager_user, api_user, settings, view
):
today = datetime.date.today()
today = now().date()
resource = Resource.objects.create(label='Foo bar')
agenda = Agenda.objects.create(label='Agenda', kind='meetings')
desk = Desk.objects.create(agenda=agenda, label='Desk')