From ba164c16f6f27ce7c6dc6bfa401380b38d1be4e9 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 9 Mar 2020 12:56:58 +0100 Subject: [PATCH] Fix test failure that only happens in the 20 days before daylight saving time changes --- src/tests/api/test_orders.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/api/test_orders.py b/src/tests/api/test_orders.py index a0044715ad..cf39b65322 100644 --- a/src/tests/api/test_orders.py +++ b/src/tests/api/test_orders.py @@ -1286,7 +1286,7 @@ def test_order_extend_pending(token_client, organizer, event, order): assert resp.status_code == 200 order.refresh_from_db() assert order.status == Order.STATUS_PENDING - assert order.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 22:59:59" + assert order.expires.astimezone(event.timezone).strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 23:59:59" @pytest.mark.django_db @@ -1326,7 +1326,7 @@ def test_order_extend_expired_quota_ignore(token_client, organizer, event, order assert resp.status_code == 200 order.refresh_from_db() assert order.status == Order.STATUS_PENDING - assert order.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 22:59:59" + assert order.expires.astimezone(event.timezone).strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 23:59:59" @pytest.mark.django_db @@ -1348,7 +1348,7 @@ def test_order_extend_expired_quota_waiting_list(token_client, organizer, event, assert resp.status_code == 200 order.refresh_from_db() assert order.status == Order.STATUS_PENDING - assert order.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 22:59:59" + assert order.expires.astimezone(event.timezone).strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 23:59:59" @pytest.mark.django_db @@ -1368,7 +1368,7 @@ def test_order_extend_expired_quota_left(token_client, organizer, event, order, assert resp.status_code == 200 order.refresh_from_db() assert order.status == Order.STATUS_PENDING - assert order.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 22:59:59" + assert order.expires.astimezone(event.timezone).strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 23:59:59" @pytest.mark.django_db