From f85964ab1a0ff506e94a23c20c00e88b2de9f0e1 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Thu, 12 Nov 2020 15:05:07 +0100 Subject: [PATCH 1/2] tests: use current timezone rather than UTC (#48464) --- tests/test_agendas.py | 4 ++-- tests/test_api.py | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/test_agendas.py b/tests/test_agendas.py index ea5adef..0e204d5 100644 --- a/tests/test_agendas.py +++ b/tests/test_agendas.py @@ -240,8 +240,8 @@ def test_event_bookable_period(start_days, start_minutes, min_delay, max_delay, label=u'Foo bar', minimal_booking_delay=min_delay, maximal_booking_delay=max_delay ) event = Event.objects.create( - start_datetime=now() + datetime.timedelta(days=start_days, minutes=start_minutes), - publication_date=(now().date() + datetime.timedelta(days=pub_days)) if pub_days else None, + start_datetime=localtime() + datetime.timedelta(days=start_days, minutes=start_minutes), + publication_date=(localtime().date() + datetime.timedelta(days=pub_days)) if pub_days else None, places=10, agenda=agenda, ) diff --git a/tests/test_api.py b/tests/test_api.py index ece68e5..d867dbc 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -232,20 +232,18 @@ def test_agendas_api(app): resp = app.get('/api/agenda/', params={'with_open_events': '1'}) assert len(resp.json['data']) == 0 - first_date = localtime(now()).replace(hour=17, minute=0, second=0, microsecond=0) - first_date += datetime.timedelta(days=1) event1 = Event.objects.create( - start_datetime=(now() + datetime.timedelta(days=5)).replace(hour=10, minute=0), + start_datetime=(localtime() + datetime.timedelta(days=5)).replace(hour=10, minute=0), places=20, agenda=event_agenda, ) event2 = Event.objects.create( - start_datetime=(now() + datetime.timedelta(days=10)).replace(hour=10, minute=0), + start_datetime=(localtime() + datetime.timedelta(days=10)).replace(hour=10, minute=0), places=20, agenda=event_agenda, ) event3 = Event.objects.create( - start_datetime=(now() + datetime.timedelta(days=15)).replace(hour=10, minute=0), + start_datetime=(localtime() + datetime.timedelta(days=15)).replace(hour=10, minute=0), places=20, agenda=event_agenda, ) @@ -2747,20 +2745,18 @@ def test_multiple_booking_move_booking(app, user): def test_agenda_detail_api(app): agenda = Agenda.objects.create(label='Foo bar', kind='events', minimal_booking_delay=0) - first_date = localtime(now()).replace(hour=17, minute=0, second=0, microsecond=0) - first_date += datetime.timedelta(days=1) event1 = Event.objects.create( - start_datetime=(now() + datetime.timedelta(days=5)).replace(hour=10, minute=0), + start_datetime=(localtime() + datetime.timedelta(days=5)).replace(hour=10, minute=0), places=20, agenda=agenda, ) event2 = Event.objects.create( - start_datetime=(now() + datetime.timedelta(days=10)).replace(hour=10, minute=0), + start_datetime=(localtime() + datetime.timedelta(days=10)).replace(hour=10, minute=0), places=20, agenda=agenda, ) event3 = Event.objects.create( - start_datetime=(now() + datetime.timedelta(days=15)).replace(hour=10, minute=0), + start_datetime=(localtime() + datetime.timedelta(days=15)).replace(hour=10, minute=0), places=20, agenda=agenda, ) -- 2.20.1