Projet

Général

Profil

0001-tests-use-current-timezone-rather-than-UTC-48464.patch

Valentin Deniaud, 13 novembre 2020 10:09

Télécharger (3,53 ko)

Voir les différences:

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(-)
tests/test_agendas.py
239 239
        label=u'Foo bar', minimal_booking_delay=min_delay, maximal_booking_delay=max_delay
240 240
    )
241 241
    event = Event.objects.create(
242
        start_datetime=now() + datetime.timedelta(days=start_days, minutes=start_minutes),
243
        publication_date=(now().date() + datetime.timedelta(days=pub_days)) if pub_days else None,
242
        start_datetime=localtime() + datetime.timedelta(days=start_days, minutes=start_minutes),
243
        publication_date=(localtime().date() + datetime.timedelta(days=pub_days)) if pub_days else None,
244 244
        places=10,
245 245
        agenda=agenda,
246 246
    )
tests/test_api.py
232 232
    resp = app.get('/api/agenda/', params={'with_open_events': '1'})
233 233
    assert len(resp.json['data']) == 0
234 234

  
235
    first_date = localtime(now()).replace(hour=17, minute=0, second=0, microsecond=0)
236
    first_date += datetime.timedelta(days=1)
237 235
    event1 = Event.objects.create(
238
        start_datetime=(now() + datetime.timedelta(days=5)).replace(hour=10, minute=0),
236
        start_datetime=(localtime() + datetime.timedelta(days=5)).replace(hour=10, minute=0),
239 237
        places=20,
240 238
        agenda=event_agenda,
241 239
    )
242 240
    event2 = Event.objects.create(
243
        start_datetime=(now() + datetime.timedelta(days=10)).replace(hour=10, minute=0),
241
        start_datetime=(localtime() + datetime.timedelta(days=10)).replace(hour=10, minute=0),
244 242
        places=20,
245 243
        agenda=event_agenda,
246 244
    )
247 245
    event3 = Event.objects.create(
248
        start_datetime=(now() + datetime.timedelta(days=15)).replace(hour=10, minute=0),
246
        start_datetime=(localtime() + datetime.timedelta(days=15)).replace(hour=10, minute=0),
249 247
        places=20,
250 248
        agenda=event_agenda,
251 249
    )
......
2710 2708

  
2711 2709
def test_agenda_detail_api(app):
2712 2710
    agenda = Agenda.objects.create(label='Foo bar', kind='events', minimal_booking_delay=0)
2713
    first_date = localtime(now()).replace(hour=17, minute=0, second=0, microsecond=0)
2714
    first_date += datetime.timedelta(days=1)
2715 2711
    event1 = Event.objects.create(
2716
        start_datetime=(now() + datetime.timedelta(days=5)).replace(hour=10, minute=0),
2712
        start_datetime=(localtime() + datetime.timedelta(days=5)).replace(hour=10, minute=0),
2717 2713
        places=20,
2718 2714
        agenda=agenda,
2719 2715
    )
2720 2716
    event2 = Event.objects.create(
2721
        start_datetime=(now() + datetime.timedelta(days=10)).replace(hour=10, minute=0),
2717
        start_datetime=(localtime() + datetime.timedelta(days=10)).replace(hour=10, minute=0),
2722 2718
        places=20,
2723 2719
        agenda=agenda,
2724 2720
    )
2725 2721
    event3 = Event.objects.create(
2726
        start_datetime=(now() + datetime.timedelta(days=15)).replace(hour=10, minute=0),
2722
        start_datetime=(localtime() + datetime.timedelta(days=15)).replace(hour=10, minute=0),
2727 2723
        places=20,
2728 2724
        agenda=agenda,
2729 2725
    )
2730
-