Projet

Général

Profil

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

Valentin Deniaud, 18 novembre 2020 10:52

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
240 240
        label=u'Foo bar', minimal_booking_delay=min_delay, maximal_booking_delay=max_delay
241 241
    )
242 242
    event = Event.objects.create(
243
        start_datetime=now() + datetime.timedelta(days=start_days, minutes=start_minutes),
244
        publication_date=(now().date() + datetime.timedelta(days=pub_days)) if pub_days else None,
243
        start_datetime=localtime() + datetime.timedelta(days=start_days, minutes=start_minutes),
244
        publication_date=(localtime().date() + datetime.timedelta(days=pub_days)) if pub_days else None,
245 245
        places=10,
246 246
        agenda=agenda,
247 247
    )
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
    )
......
2747 2745

  
2748 2746
def test_agenda_detail_api(app):
2749 2747
    agenda = Agenda.objects.create(label='Foo bar', kind='events', minimal_booking_delay=0)
2750
    first_date = localtime(now()).replace(hour=17, minute=0, second=0, microsecond=0)
2751
    first_date += datetime.timedelta(days=1)
2752 2748
    event1 = Event.objects.create(
2753
        start_datetime=(now() + datetime.timedelta(days=5)).replace(hour=10, minute=0),
2749
        start_datetime=(localtime() + datetime.timedelta(days=5)).replace(hour=10, minute=0),
2754 2750
        places=20,
2755 2751
        agenda=agenda,
2756 2752
    )
2757 2753
    event2 = Event.objects.create(
2758
        start_datetime=(now() + datetime.timedelta(days=10)).replace(hour=10, minute=0),
2754
        start_datetime=(localtime() + datetime.timedelta(days=10)).replace(hour=10, minute=0),
2759 2755
        places=20,
2760 2756
        agenda=agenda,
2761 2757
    )
2762 2758
    event3 = Event.objects.create(
2763
        start_datetime=(now() + datetime.timedelta(days=15)).replace(hour=10, minute=0),
2759
        start_datetime=(localtime() + datetime.timedelta(days=15)).replace(hour=10, minute=0),
2764 2760
        places=20,
2765 2761
        agenda=agenda,
2766 2762
    )
2767
-