From 12a1fbaa728e5c9e8291930b001471b0e8ecc59f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= Date: Thu, 1 Jun 2023 09:47:08 +0200 Subject: [PATCH] misc: fix failing tests at midnigth (#78069) --- chrono/manager/views.py | 2 +- tests/manager/test_all.py | 14 +++++++------- tests/manager/test_event.py | 4 ++-- tests/manager/test_resource.py | 22 +++++++++++----------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/chrono/manager/views.py b/chrono/manager/views.py index ad94ba95..98fbcd16 100644 --- a/chrono/manager/views.py +++ b/chrono/manager/views.py @@ -3744,7 +3744,7 @@ class EventCancelView(ViewableAgendaMixin, UpdateView): next_url = self.request.POST.get('next') if next_url: return next_url - day = self.event.start_datetime + day = localtime(self.event.start_datetime) return reverse( 'chrono-manager-agenda-month-view', kwargs={'pk': self.event.agenda.pk, 'year': day.year, 'month': day.month, 'day': day.day}, diff --git a/tests/manager/test_all.py b/tests/manager/test_all.py index bb2550ff..11594d79 100644 --- a/tests/manager/test_all.py +++ b/tests/manager/test_all.py @@ -1877,7 +1877,7 @@ def test_agenda_month_view_januaries(app, admin_user, kind): @pytest.mark.parametrize('kind', ['meetings', 'virtual']) def test_agenda_month_view_event_outside_timeperiod(app, admin_user, kind): - today = datetime.date.today() + today = now().date() if kind == 'meetings': agenda = Agenda.objects.create(label='New Example', kind='meetings') desk = Desk.objects.create(agenda=agenda, label='New Desk') @@ -1936,8 +1936,8 @@ def test_agenda_month_view_event_outside_timeperiod(app, admin_user, kind): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace( - day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0 + start_datetime=localtime( + now().replace(day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0) ), ) Booking.objects.create(event=event) @@ -1966,8 +1966,8 @@ def test_agenda_month_view_event_outside_timeperiod(app, admin_user, kind): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace( - day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0 + start_datetime=localtime( + now().replace(day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0) ), ) Booking.objects.create(event=event) @@ -2328,7 +2328,7 @@ def test_agenda_week_view_event_outside_timeperiod(app, admin_user, kind): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace(day=middle_day.day, hour=10, minute=0), + start_datetime=localtime(now().replace(day=middle_day.day, hour=10, minute=0)), ) Booking.objects.create(event=event) resp = app.get( @@ -2363,7 +2363,7 @@ def test_agenda_week_view_event_outside_timeperiod(app, admin_user, kind): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace(day=middle_day.day, hour=10, minute=0), + start_datetime=localtime(now().replace(day=middle_day.day, hour=10, minute=0)), ) Booking.objects.create(event=event) resp = app.get( diff --git a/tests/manager/test_event.py b/tests/manager/test_event.py index 4dab2e0b..f8594671 100644 --- a/tests/manager/test_event.py +++ b/tests/manager/test_event.py @@ -1245,7 +1245,7 @@ def test_event_cancellation_error_report(app, admin_user): event = Event.objects.create( label='xyz', start_datetime=now() + datetime.timedelta(days=1), places=10, agenda=agenda ) - day = event.start_datetime + day = localtime(event.start_datetime) def mocked_requests_connection_error(*args, **kwargs): raise requests.exceptions.ConnectionError('unreachable') @@ -1367,7 +1367,7 @@ def test_event_booking_form_url(settings, app, admin_user): event = Event.objects.create( label='xyz', start_datetime=now() + datetime.timedelta(days=1), places=10, agenda=agenda ) - day = event.start_datetime + day = localtime(event.start_datetime) login(app) diff --git a/tests/manager/test_resource.py b/tests/manager/test_resource.py index e4e9c415..b67ad3d8 100644 --- a/tests/manager/test_resource.py +++ b/tests/manager/test_resource.py @@ -453,8 +453,8 @@ def test_resource_week_view_event_outside_timeperiod(app, admin_user): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace( - day=middle_day.day - middle_day.weekday() + 2, hour=hour, minute=minute + start_datetime=localtime( + now().replace(day=middle_day.day - middle_day.weekday() + 2, hour=hour, minute=minute) ), ) event.resources.add(resource) @@ -496,7 +496,7 @@ def test_resource_week_view_event_outside_timeperiod(app, admin_user): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace(day=middle_day.day, hour=10, minute=0), + start_datetime=localtime(now().replace(day=middle_day.day, hour=10, minute=0)), ) event.resources.add(resource) Booking.objects.create(event=event) @@ -535,7 +535,7 @@ def test_resource_week_view_event_outside_timeperiod(app, admin_user): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace(day=middle_day.day, hour=10, minute=0), + start_datetime=localtime(now().replace(day=middle_day.day, hour=10, minute=0)), ) event.resources.add(resource) Booking.objects.create(event=event) @@ -744,7 +744,7 @@ def test_resource_month_view_januaries(app, admin_user): def test_resource_month_view_event_outside_timeperiod(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') agenda.resources.add(resource) @@ -765,8 +765,8 @@ def test_resource_month_view_event_outside_timeperiod(app, admin_user): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace( - day=middle_day.day - middle_day.weekday() + 2, hour=hour, minute=minute + start_datetime=localtime(now().replace(day=middle_day.day - middle_day.weekday() + 2)).replace( + hour=hour, minute=minute ), ) event.resources.add(resource) @@ -797,8 +797,8 @@ def test_resource_month_view_event_outside_timeperiod(app, admin_user): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace( - day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0 + start_datetime=localtime( + now().replace(day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0) ), ) event.resources.add(resource) @@ -828,8 +828,8 @@ def test_resource_month_view_event_outside_timeperiod(app, admin_user): places=1, desk=desk, meeting_type=meetingtype, - start_datetime=localtime(now()).replace( - day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0 + start_datetime=localtime( + now().replace(day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0) ), ) event.resources.add(resource)