entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 8 Releases Wiki Activity

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

This commit is contained in:
Lauréline Guérin 2023-06-01 09:47:08 +02:00
parent df6721d580
commit 12a1fbaa72
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrono/manager/views.py
View File

@ -3744,7 +3744,7 @@ class EventCancelView(ViewableAgendaMixin, UpdateView):
next_url = self.request.POST.get('next') next_url = self.request.POST.get('next')
if next_url: if next_url:
return next_url return next_url
day = self.event.start_datetime day = localtime(self.event.start_datetime)
return reverse( return reverse(
'chrono-manager-agenda-month-view', 'chrono-manager-agenda-month-view',
kwargs={'pk': self.event.agenda.pk, 'year': day.year, 'month': day.month, 'day': day.day}, kwargs={'pk': self.event.agenda.pk, 'year': day.year, 'month': day.month, 'day': day.day},

14
tests/manager/test_all.py
View File

@ -1877,7 +1877,7 @@ def test_agenda_month_view_januaries(app, admin_user, kind):
@pytest.mark.parametrize('kind', ['meetings', 'virtual']) @pytest.mark.parametrize('kind', ['meetings', 'virtual'])
def test_agenda_month_view_event_outside_timeperiod(app, admin_user, kind): def test_agenda_month_view_event_outside_timeperiod(app, admin_user, kind):
today = datetime.date.today() today = now().date()
if kind == 'meetings': if kind == 'meetings':
agenda = Agenda.objects.create(label='New Example', kind='meetings') agenda = Agenda.objects.create(label='New Example', kind='meetings')
desk = Desk.objects.create(agenda=agenda, label='New Desk') 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, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, meeting_type=meetingtype,
start_datetime=localtime(now()).replace( start_datetime=localtime(
day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0 now().replace(day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0)
), ),
) )
Booking.objects.create(event=event) Booking.objects.create(event=event)
@ -1966,8 +1966,8 @@ def test_agenda_month_view_event_outside_timeperiod(app, admin_user, kind):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, meeting_type=meetingtype,
start_datetime=localtime(now()).replace( start_datetime=localtime(
day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0 now().replace(day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0)
), ),
) )
Booking.objects.create(event=event) Booking.objects.create(event=event)
@ -2328,7 +2328,7 @@ def test_agenda_week_view_event_outside_timeperiod(app, admin_user, kind):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, 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) Booking.objects.create(event=event)
resp = app.get( resp = app.get(
@ -2363,7 +2363,7 @@ def test_agenda_week_view_event_outside_timeperiod(app, admin_user, kind):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, 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) Booking.objects.create(event=event)
resp = app.get( resp = app.get(

4
tests/manager/test_event.py
View File

@ -1245,7 +1245,7 @@ def test_event_cancellation_error_report(app, admin_user):
event = Event.objects.create( event = Event.objects.create(
label='xyz', start_datetime=now() + datetime.timedelta(days=1), places=10, agenda=agenda 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): def mocked_requests_connection_error(*args, **kwargs):
raise requests.exceptions.ConnectionError('unreachable') raise requests.exceptions.ConnectionError('unreachable')
@ -1367,7 +1367,7 @@ def test_event_booking_form_url(settings, app, admin_user):
event = Event.objects.create( event = Event.objects.create(
label='xyz', start_datetime=now() + datetime.timedelta(days=1), places=10, agenda=agenda label='xyz', start_datetime=now() + datetime.timedelta(days=1), places=10, agenda=agenda
) )
day = event.start_datetime day = localtime(event.start_datetime)
login(app) login(app)

22
tests/manager/test_resource.py
View File

@ -453,8 +453,8 @@ def test_resource_week_view_event_outside_timeperiod(app, admin_user):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, meeting_type=meetingtype,
start_datetime=localtime(now()).replace( start_datetime=localtime(
day=middle_day.day - middle_day.weekday() + 2, hour=hour, minute=minute now().replace(day=middle_day.day - middle_day.weekday() + 2, hour=hour, minute=minute)
), ),
) )
event.resources.add(resource) event.resources.add(resource)
@ -496,7 +496,7 @@ def test_resource_week_view_event_outside_timeperiod(app, admin_user):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, 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) event.resources.add(resource)
Booking.objects.create(event=event) Booking.objects.create(event=event)
@ -535,7 +535,7 @@ def test_resource_week_view_event_outside_timeperiod(app, admin_user):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, 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) event.resources.add(resource)
Booking.objects.create(event=event) 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): 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') resource = Resource.objects.create(label='Foo bar')
agenda = Agenda.objects.create(label='Agenda', kind='meetings') agenda = Agenda.objects.create(label='Agenda', kind='meetings')
agenda.resources.add(resource) agenda.resources.add(resource)
@ -765,8 +765,8 @@ def test_resource_month_view_event_outside_timeperiod(app, admin_user):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, meeting_type=meetingtype,
start_datetime=localtime(now()).replace( start_datetime=localtime(now().replace(day=middle_day.day - middle_day.weekday() + 2)).replace(
day=middle_day.day - middle_day.weekday() + 2, hour=hour, minute=minute hour=hour, minute=minute
), ),
) )
event.resources.add(resource) event.resources.add(resource)
@ -797,8 +797,8 @@ def test_resource_month_view_event_outside_timeperiod(app, admin_user):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, meeting_type=meetingtype,
start_datetime=localtime(now()).replace( start_datetime=localtime(
day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0 now().replace(day=middle_day.day - middle_day.weekday() + 5, hour=10, minute=0)
), ),
) )
event.resources.add(resource) event.resources.add(resource)
@ -828,8 +828,8 @@ def test_resource_month_view_event_outside_timeperiod(app, admin_user):
places=1, places=1,
desk=desk, desk=desk,
meeting_type=meetingtype, meeting_type=meetingtype,
start_datetime=localtime(now()).replace( start_datetime=localtime(
day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0 now().replace(day=middle_day.day - middle_day.weekday() + 6, hour=10, minute=0)
), ),
) )
event.resources.add(resource) event.resources.add(resource)