Commit fd3ffa7b authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg

Merge branch 'fix-tests' into 'master'

Rely on timezone.now instead of datetime.now for expiration emails so that tests work

See merge request !1316
parents 2e7507bc 205e8b1d
...@@ -8,7 +8,6 @@ from django.template import loader ...@@ -8,7 +8,6 @@ from django.template import loader
from django.template.defaultfilters import floatformat from django.template.defaultfilters import floatformat
from django.urls import reverse from django.urls import reverse
from django.utils import timezone, translation from django.utils import timezone, translation
from django.utils.datetime_safe import datetime
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from members.models import Member, Membership from members.models import Member, Membership
...@@ -124,7 +123,7 @@ def send_expiration_announcement(dry_run=False): ...@@ -124,7 +123,7 @@ def send_expiration_announcement(dry_run=False):
:param dry_run: does not really send emails if True :param dry_run: does not really send emails if True
""" """
expiry_date = datetime.now() + timedelta(days=31) expiry_date = timezone.now() + timedelta(days=31)
members = (Member.current_members members = (Member.current_members
.filter(membership__until__lte=expiry_date) .filter(membership__until__lte=expiry_date)
.exclude(membership__until__isnull=True) .exclude(membership__until__isnull=True)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment