From 71eebc14fa4bfa243d1ad7fdc5e0f0d83f36220d Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 9 Dec 2020 15:13:32 +0100 Subject: [PATCH] tests: keep weekday numbers under 7 (#49291) --- tests/test_api.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_api.py b/tests/test_api.py index b486cae..0e8aa29 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -3636,9 +3636,9 @@ def test_virtual_agendas_meetings_datetimes_api_with_similar_desk(app): label=u'Agenda Foo', kind='meetings', minimal_booking_delay=1, maximal_booking_delay=4 ) meeting_type_foo = MeetingType.objects.create(agenda=agenda_foo, label='Meeting Type', duration=30) - test_1st_weekday = localtime(now()).weekday() + 1 % 7 - test_2nd_weekday = localtime(now()).weekday() + 2 % 7 - test_3rd_weekday = localtime(now()).weekday() + 3 % 7 + test_1st_weekday = (localtime(now()).weekday() + 1) % 7 + test_2nd_weekday = (localtime(now()).weekday() + 2) % 7 + test_3rd_weekday = (localtime(now()).weekday() + 3) % 7 desk_foo = Desk.objects.create(agenda=agenda_foo, label='Desk 1') TimePeriod.objects.create( @@ -4473,7 +4473,7 @@ def test_unavailabilitycalendar_on_virtual_datetimes(app, user, mock_now): assert data[-1]['datetime'] == '2017-05-23 10:30:00' -@pytest.mark.parametrize('test_datetime', (None, '2020-11-11 23:50')) +@pytest.mark.parametrize('test_datetime', (None, '2020-11-11 23:50', '2020-12-06 10:14')) def test_datetimes_maximal_booking_delay(app, user, freezer, test_datetime): if test_datetime: freezer.move_to(test_datetime) @@ -4482,8 +4482,8 @@ def test_datetimes_maximal_booking_delay(app, user, freezer, test_datetime): ) MeetingType.objects.create(agenda=foo_agenda, label='Meeting Type', duration=30) foo_desk = Desk.objects.create(agenda=foo_agenda, label='Foo desk 1') - weekday1 = (localtime(now())).weekday() + 1 % 7 - weekday2 = (localtime(now())).weekday() + 2 % 7 + weekday1 = ((localtime(now())).weekday() + 1) % 7 + weekday2 = ((localtime(now())).weekday() + 2) % 7 TimePeriod.objects.create( weekday=weekday1, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0), desk=foo_desk ) -- 2.20.1