From 05ecfdb9e2f46f6c0dfbb7bf9727d35f4304f542 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 20 Oct 2016 17:56:48 +0200 Subject: [PATCH] Refs #273 -- Add backwards migration (noop) and fix tests --- src/pretix/base/migrations/0042_order_expires.py | 2 +- src/tests/control/test_orders.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pretix/base/migrations/0042_order_expires.py b/src/pretix/base/migrations/0042_order_expires.py index df4abf541..5d1ea51dc 100644 --- a/src/pretix/base/migrations/0042_order_expires.py +++ b/src/pretix/base/migrations/0042_order_expires.py @@ -27,5 +27,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(forwards) + migrations.RunPython(forwards, migrations.RunPython.noop) ] diff --git a/src/tests/control/test_orders.py b/src/tests/control/test_orders.py index 30f1c5587..97da226c9 100644 --- a/src/tests/control/test_orders.py +++ b/src/tests/control/test_orders.py @@ -443,7 +443,7 @@ def test_order_extend_not_expired(client, env): }, follow=True) assert 'alert-success' in response.rendered_content o = Order.objects.get(id=env[2].id) - assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate + assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 23:59:59" @pytest.mark.django_db @@ -460,7 +460,7 @@ def test_order_extend_overdue_quota_empty(client, env): }, follow=True) assert 'alert-success' in response.rendered_content o = Order.objects.get(id=env[2].id) - assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate + assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 23:59:59" @pytest.mark.django_db @@ -478,7 +478,7 @@ def test_order_extend_expired_quota_left(client, env): }, follow=True) assert 'alert-success' in response.rendered_content o = Order.objects.get(id=env[2].id) - assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate + assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate[:10] + " 23:59:59" assert o.status == Order.STATUS_PENDING