From 3c25b09fa0950db37db3e7a7d8d0fb3451a1f234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= Date: Wed, 19 Apr 2023 00:20:36 +0200 Subject: [PATCH] misc: fix failing tests at midnigth (#75589) --- chrono/agendas/models.py | 2 +- chrono/manager/views.py | 3 ++- tests/api/test_serializer.py | 4 ++-- tests/manager/test_all.py | 8 ++++---- tests/manager/test_event.py | 6 +++--- tests/manager/test_resource.py | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/chrono/agendas/models.py b/chrono/agendas/models.py index b2ecf555..ad79834a 100644 --- a/chrono/agendas/models.py +++ b/chrono/agendas/models.py @@ -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): diff --git a/chrono/manager/views.py b/chrono/manager/views.py index c5874057..57c3dbfa 100644 --- a/chrono/manager/views.py +++ b/chrono/manager/views.py @@ -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, ) diff --git a/tests/api/test_serializer.py b/tests/api/test_serializer.py index 4771caae..a0f26fd7 100644 --- a/tests/api/test_serializer.py +++ b/tests/api/test_serializer.py @@ -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( diff --git a/tests/manager/test_all.py b/tests/manager/test_all.py index b1a8f328..6e2dae31 100644 --- a/tests/manager/test_all.py +++ b/tests/manager/test_all.py @@ -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) diff --git a/tests/manager/test_event.py b/tests/manager/test_event.py index 10cc1a95..4dab2e0b 100644 --- a/tests/manager/test_event.py +++ b/tests/manager/test_event.py @@ -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), diff --git a/tests/manager/test_resource.py b/tests/manager/test_resource.py index bca09415..70756746 100644 --- a/tests/manager/test_resource.py +++ b/tests/manager/test_resource.py @@ -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')