diff --git a/src/api/tests/schedule.py b/src/api/tests/schedule.py index 6bd544d494d6a948103ce8529df925e249d1f406..66424c5ac2f90ebdfe2f302149aab75b4afd7374 100644 --- a/src/api/tests/schedule.py +++ b/src/api/tests/schedule.py @@ -1,3 +1,4 @@ +from datetime import timedelta import json from django.test import TestCase @@ -60,6 +61,8 @@ class ScheduleTest(TestCase): event.refresh_from_db() self.assertTrue('rC3' in event.name, f'Expected "rC3" in event name "{event.name}".') + self.assertEqual(timedelta(minutes=30), event.schedule_duration) + self.assertIsNotNone(event.schedule_end) def test_push_new_event(self): update = { @@ -69,7 +72,7 @@ class ScheduleTest(TestCase): "logo": None, "date": "2020-12-27T12:20:00+01:00", "start": "12:20", - "duration": "00:30", + "duration": "01:30", "room": "foo room", "slug": "rc3-11583-rc3_eroffnung", "title": "#rC3 Er\u00f6ffnung", @@ -98,3 +101,5 @@ class ScheduleTest(TestCase): self.assertTrue(Event.objects.filter(pk=update['guid']).exists()) event = Event.objects.get(pk=update['guid']) self.assertTrue('rC3' in event.name, f'Expected "rC3" in event name "{event.name}".') + self.assertEqual(timedelta(minutes=90), event.schedule_duration) + self.assertIsNotNone(event.schedule_end) diff --git a/src/api/views/schedule.py b/src/api/views/schedule.py index e9249d4e4001796431cd94477a7b1a747bdb944e..65ecbcd9b25f0001b9c668be47195fb44e0d2b33 100644 --- a/src/api/views/schedule.py +++ b/src/api/views/schedule.py @@ -71,7 +71,7 @@ def schedulexml_time_to_timedelta(s): else: hours, minutes = 0, s - timedelta(hours=int(hours), minutes=int(minutes)) + return timedelta(hours=int(hours), minutes=int(minutes)) class EventSchedule(ConferenceSlugMixin, APIView):