misc: fix failing tests at midnigth (#75589)
gitea/chrono/pipeline/head This commit looks good
Details
gitea/chrono/pipeline/head This commit looks good
Details
This commit is contained in:
parent
41df2c58a5
commit
3c25b09fa0
|
@ -1659,7 +1659,7 @@ class Event(models.Model):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def is_day_past(self):
|
def is_day_past(self):
|
||||||
return self.start_datetime.date() <= now().date()
|
return localtime(self.start_datetime).date() <= localtime(now()).date()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def annotate_queryset_for_user(qs, user_external_id, with_status=False):
|
def annotate_queryset_for_user(qs, user_external_id, with_status=False):
|
||||||
|
|
|
@ -2539,7 +2539,8 @@ class EventCheckView(ViewableAgendaMixin, DetailView):
|
||||||
queryset = super().get_queryset()
|
queryset = super().get_queryset()
|
||||||
queryset = Event.annotate_booking_checks(queryset)
|
queryset = Event.annotate_booking_checks(queryset)
|
||||||
return queryset.filter(
|
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,
|
agenda=self.agenda,
|
||||||
cancelled=False,
|
cancelled=False,
|
||||||
)
|
)
|
||||||
|
|
|
@ -14,8 +14,8 @@ def test_subscribed_with_dates():
|
||||||
Subscription.objects.create(
|
Subscription.objects.create(
|
||||||
agenda=agenda,
|
agenda=agenda,
|
||||||
user_external_id='xxx',
|
user_external_id='xxx',
|
||||||
date_start=now(),
|
date_start=now().date(),
|
||||||
date_end=now() + datetime.timedelta(days=30),
|
date_end=now().date() + datetime.timedelta(days=30),
|
||||||
)
|
)
|
||||||
|
|
||||||
serializer = AgendaOrSubscribedSlugsSerializer(
|
serializer = AgendaOrSubscribedSlugsSerializer(
|
||||||
|
|
|
@ -1261,7 +1261,7 @@ def test_agenda_events_day_view(app, admin_user):
|
||||||
|
|
||||||
def test_agenda_events_day_view_midnight(app, admin_user):
|
def test_agenda_events_day_view_midnight(app, admin_user):
|
||||||
agenda = Agenda.objects.create(label='Events', kind='events', default_view='day')
|
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)
|
Event.objects.create(label='xyz', start_datetime=midnight, places=10, agenda=agenda)
|
||||||
|
|
||||||
login(app)
|
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):
|
def test_agenda_events_week_view_midnight(app, admin_user):
|
||||||
agenda = Agenda.objects.create(label='Events', kind='events', default_view='day')
|
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)
|
Event.objects.create(label='xyz', start_datetime=midnight, places=10, agenda=agenda)
|
||||||
|
|
||||||
login(app)
|
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):
|
def test_agenda_events_month_view_midnight(app, admin_user):
|
||||||
agenda = Agenda.objects.create(label='Events', kind='events', default_view='day')
|
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)
|
Event.objects.create(label='xyz', start_datetime=midnight, places=10, agenda=agenda)
|
||||||
|
|
||||||
login(app)
|
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')
|
desk1 = Desk.objects.create(agenda=real_agenda_1, label='New Desk')
|
||||||
desk2 = Desk.objects.create(agenda=real_agenda_2, 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)
|
meetingtype1 = MeetingType.objects.create(agenda=real_agenda_1, label='Bar', duration=30)
|
||||||
meetingtype2 = MeetingType.objects.create(agenda=real_agenda_2, label='Bar', duration=30)
|
meetingtype2 = MeetingType.objects.create(agenda=real_agenda_2, label='Bar', duration=30)
|
||||||
|
|
|
@ -671,7 +671,7 @@ def test_delete_busy_event(app, admin_user):
|
||||||
def test_delete_recurring_event(app, admin_user, freezer):
|
def test_delete_recurring_event(app, admin_user, freezer):
|
||||||
agenda = Agenda.objects.create(label='Foo bar', kind='events')
|
agenda = Agenda.objects.create(label='Foo bar', kind='events')
|
||||||
Desk.objects.create(agenda=agenda, slug='_exceptions_holder')
|
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(
|
event = Event.objects.create(
|
||||||
start_datetime=start_datetime,
|
start_datetime=start_datetime,
|
||||||
places=10,
|
places=10,
|
||||||
|
@ -1681,7 +1681,7 @@ def test_event_checked(app, admin_user):
|
||||||
Desk.objects.create(agenda=agenda, slug='_exceptions_holder')
|
Desk.objects.create(agenda=agenda, slug='_exceptions_holder')
|
||||||
event = Event.objects.create(
|
event = Event.objects.create(
|
||||||
label='xyz',
|
label='xyz',
|
||||||
start_datetime=now() - datetime.timedelta(days=1),
|
start_datetime=localtime(now()) - datetime.timedelta(days=1),
|
||||||
places=10,
|
places=10,
|
||||||
agenda=agenda,
|
agenda=agenda,
|
||||||
)
|
)
|
||||||
|
@ -1749,7 +1749,7 @@ def test_event_checked(app, admin_user):
|
||||||
agenda.disable_check_update = False
|
agenda.disable_check_update = False
|
||||||
agenda.save()
|
agenda.save()
|
||||||
assert agenda.enable_check_for_future_events is False
|
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()
|
event.save()
|
||||||
app.post(
|
app.post(
|
||||||
'/manage/agendas/%s/events/%s/checked' % (agenda.pk, event.pk),
|
'/manage/agendas/%s/events/%s/checked' % (agenda.pk, event.pk),
|
||||||
|
|
|
@ -81,7 +81,7 @@ def test_resource_redirect(app, admin_user):
|
||||||
|
|
||||||
|
|
||||||
def test_resource_day_view(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')
|
resource = Resource.objects.create(label='Foo bar')
|
||||||
agenda = Agenda.objects.create(label='Agenda', kind='meetings')
|
agenda = Agenda.objects.create(label='Agenda', kind='meetings')
|
||||||
desk = Desk.objects.create(agenda=agenda, label='Desk')
|
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(
|
def test_agenda_day_month_view_backoffice_url_translation(
|
||||||
app, admin_user, manager_user, api_user, settings, view
|
app, admin_user, manager_user, api_user, settings, view
|
||||||
):
|
):
|
||||||
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')
|
||||||
desk = Desk.objects.create(agenda=agenda, label='Desk')
|
desk = Desk.objects.create(agenda=agenda, label='Desk')
|
||||||
|
|
Loading…
Reference in New Issue