From 68033e5d7db4f1de2ad09667cbdf0b11ef725534 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sat, 6 Apr 2019 20:22:27 +0200 Subject: [PATCH] Resolve naive datetime warnings in test suite --- src/tests/api/test_cart.py | 16 ++++++++-------- src/tests/api/test_items.py | 4 ++-- src/tests/control/test_events.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/tests/api/test_cart.py b/src/tests/api/test_cart.py index 3a954d014..7f07674e1 100644 --- a/src/tests/api/test_cart.py +++ b/src/tests/api/test_cart.py @@ -76,8 +76,8 @@ def test_cp_list(token_client, organizer, event, item, taxrule, question): cr = CartPosition.objects.create( event=event, cart_id="aaa", item=item, price=23, attendee_name_parts={'full_name': 'Peter'}, - datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0), - expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0) + datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC), + expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC) ) res = dict(TEST_CARTPOSITION_RES) res["id"] = cr.pk @@ -97,8 +97,8 @@ def test_cp_list_api(token_client, organizer, event, item, taxrule, question): cr = CartPosition.objects.create( event=event, cart_id="aaa@api", item=item, price=23, attendee_name_parts={'full_name': 'Peter'}, - datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0), - expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0) + datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC), + expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC) ) res = dict(TEST_CARTPOSITION_RES) res["id"] = cr.pk @@ -118,8 +118,8 @@ def test_cp_detail(token_client, organizer, event, item, taxrule, question): cr = CartPosition.objects.create( event=event, cart_id="aaa@api", item=item, price=23, attendee_name_parts={'full_name': 'Peter'}, - datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0), - expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0) + datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC), + expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC) ) res = dict(TEST_CARTPOSITION_RES) res["id"] = cr.pk @@ -139,8 +139,8 @@ def test_cp_delete(token_client, organizer, event, item, taxrule, question): cr = CartPosition.objects.create( event=event, cart_id="aaa@api", item=item, price=23, attendee_name_parts={'full_name': 'Peter'}, - datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0), - expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0) + datetime=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC), + expires=datetime.datetime(2018, 6, 11, 10, 0, 0, 0, tzinfo=UTC) ) res = dict(TEST_CARTPOSITION_RES) res["id"] = cr.pk diff --git a/src/tests/api/test_items.py b/src/tests/api/test_items.py index e2e7fea1d..5bd4950ba 100644 --- a/src/tests/api/test_items.py +++ b/src/tests/api/test_items.py @@ -76,8 +76,8 @@ def cart_position(event, item, variations): c = CartPosition.objects.create( event=event, item=item, - datetime=datetime.now(), - expires=datetime.now() + timedelta(days=1), + datetime=testtime, + expires=testtime + timedelta(days=1), variation=variations[0], price=Decimal("23"), cart_id="z3fsn8jyufm5kpk768q69gkbyr5f4h6w" diff --git a/src/tests/control/test_events.py b/src/tests/control/test_events.py index b3bd75b08..8ea20d1c2 100644 --- a/src/tests/control/test_events.py +++ b/src/tests/control/test_events.py @@ -363,7 +363,7 @@ class EventsTest(SoupTest): def test_payment_settings_last_date_payment_after_presale_end(self): tr19 = self.event1.tax_rules.create(rate=Decimal('19.00')) - self.event1.presale_end = datetime.datetime.now() + self.event1.presale_end = now() self.event1.save(update_fields=['presale_end']) doc = self.post_doc('/control/event/%s/%s/settings/payment' % (self.orga1.slug, self.event1.slug), { 'payment_term_days': '2',