From 8ef98877501face9d6458e072fea3c2f9123d28c Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 21 Apr 2020 22:32:54 +0200
Subject: [PATCH 2/3] misc: replace DeletedUser model by attribute deleted on
 User

---
 src/authentic2/admin.py                       |  5 ---
 src/authentic2/custom_user/managers.py        | 20 +++++++++-
 .../migrations/0019_user_deleted.py           | 37 +++++++++++++++++
 src/authentic2/custom_user/models.py          | 20 +++++++++-
 .../commands/clean-unused-accounts.py         |  3 +-
 .../authentic2/manager/user_detail.html       |  7 ----
 src/authentic2/manager/user_views.py          | 13 ++++--
 src/authentic2/managers.py                    | 16 --------
 .../migrations/0027_auto_20200421_1609.py     | 40 +++++++++++++++++++
 src/authentic2/models.py                      | 16 --------
 src/authentic2/views.py                       | 12 +++---
 tests/test_all.py                             |  1 +
 tests/test_api.py                             |  4 +-
 tests/test_cleanup.py                         |  5 +--
 tests/test_commands.py                        | 27 ++++++++-----
 tests/test_user_manager.py                    | 17 ++++----
 tests/test_views.py                           | 18 +++++----
 17 files changed, 174 insertions(+), 87 deletions(-)
 create mode 100644 src/authentic2/custom_user/migrations/0019_user_deleted.py
 create mode 100644 src/authentic2/migrations/0027_auto_20200421_1609.py

diff --git src/authentic2/admin.py src/authentic2/admin.py
index 8e28f728..f7058184 100644
--- src/authentic2/admin.py
+++ src/authentic2/admin.py
@@ -84,11 +84,6 @@ class UserExternalIdAdmin(admin.ModelAdmin):
 admin.site.register(models.UserExternalId, UserExternalIdAdmin)
 
 
-class DeletedUserAdmin(admin.ModelAdmin):
-    list_display = ('user', 'creation')
-    date_hierarchy = 'creation'
-admin.site.register(models.DeletedUser, DeletedUserAdmin)
-
 DB_SESSION_ENGINES = (
     'django.contrib.sessions.backends.db',
     'django.contrib.sessions.backends.cached_db',
diff --git src/authentic2/custom_user/managers.py src/authentic2/custom_user/managers.py
index 339e5a9a..d344e604 100644
--- src/authentic2/custom_user/managers.py
+++ src/authentic2/custom_user/managers.py
@@ -14,7 +14,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.db import models
+import datetime
+import logging
+
+from django.db import models, transaction
 from django.utils import six
 from django.utils import timezone
 from django.contrib.auth.models import BaseUserManager
@@ -81,3 +84,18 @@ class UserManager(BaseUserManager):
 
     def get_by_natural_key(self, uuid):
         return self.get(uuid=uuid)
+
+    @transaction.atomic
+    def cleanup(self, threshold=600, timestamp=None):
+        '''Delete all deleted users for more than 10 minutes.'''
+        not_after = (timestamp or timezone.now()) - datetime.timedelta(seconds=threshold)
+        qs = self.filter(deleted__lt=not_after)
+
+        loaded = list(qs)
+
+        def log():
+            logger = logging.getLogger('authentic2')
+            for user in loaded:
+                logger.info(u'deleted account %s', user)
+        transaction.on_commit(log)
+        qs.delete()
diff --git src/authentic2/custom_user/migrations/0019_user_deleted.py src/authentic2/custom_user/migrations/0019_user_deleted.py
new file mode 100644
index 00000000..6d434adb
--- /dev/null
+++ src/authentic2/custom_user/migrations/0019_user_deleted.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-04-21 13:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.contrib.postgres.fields.jsonb
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_user', '0018_user_last_account_deletion_alert'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='deleted',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Deletion date'),
+        ),
+        migrations.CreateModel(
+            name='DeletedUser',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('deleted', models.DateTimeField(verbose_name='Deletion date')),
+                ('old_uuid', models.TextField(blank=True, null=True, verbose_name='Old UUID')),
+                ('old_user_id', models.PositiveIntegerField(blank=True, null=True, verbose_name='Old user id')),
+                ('old_email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='Old email adress')),
+                ('old_data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='Old data')),
+            ],
+            options={
+                'verbose_name': 'deleted user',
+                'verbose_name_plural': 'deleted users',
+                'ordering': ('deleted', 'id'),
+            },
+        ),
+    ]
diff --git src/authentic2/custom_user/models.py src/authentic2/custom_user/models.py
index b7e094f9..fed4b060 100644
--- src/authentic2/custom_user/models.py
+++ src/authentic2/custom_user/models.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import random
+
 from django.db import models, transaction
 from django.utils import timezone
 from django.core.mail import send_mail
@@ -155,13 +157,15 @@ class User(AbstractBaseUser, PermissionMixin):
         default=True,
         help_text=_('Designates whether this user should be treated as '
                     'active. Unselect this instead of deleting accounts.'))
-    date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
     ou = models.ForeignKey(
         verbose_name=_('organizational unit'),
         to='a2_rbac.OrganizationalUnit',
         blank=True,
         null=True,
         swappable=False)
+
+    # events dates
+    date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
     modified = models.DateTimeField(
         verbose_name=_('Last modification time'),
         db_index=True,
@@ -170,6 +174,10 @@ class User(AbstractBaseUser, PermissionMixin):
         verbose_name=_('Last account deletion alert'),
         null=True,
         blank=True)
+    deleted = models.DateTimeField(
+        verbose_name=_('Deletion date'),
+        null=True,
+        blank=True)
 
     objects = UserManager.from_queryset(UserQuerySet)()
     attributes = AttributesDescriptor()
@@ -323,3 +331,13 @@ class User(AbstractBaseUser, PermissionMixin):
         if hasattr(self, '_a2_attributes_cache'):
             del self._a2_attributes_cache
         return super(User, self).refresh_from_db(*args, **kwargs)
+
+    def mark_as_deleted(self, timestamp=None, force=True, save=True):
+        self.is_active = False
+        self.email_verified = False
+        if self.email and '#' not in self.email:
+            self.email += '#%d' % random.randint(1, 10000000)
+        if force or not self.deleted:
+            self.deleted = timestamp or timezone.now()
+        if save:
+            self.save(update_fields=['email', 'email_verified', 'is_active', 'deleted'])
diff --git src/authentic2/management/commands/clean-unused-accounts.py src/authentic2/management/commands/clean-unused-accounts.py
index 36d9bdbf..95aca5bf 100644
--- src/authentic2/management/commands/clean-unused-accounts.py
+++ src/authentic2/management/commands/clean-unused-accounts.py
@@ -27,7 +27,6 @@ from django.utils import timezone
 from django.utils.six.moves.urllib import parse as urlparse
 from django_rbac.utils import get_ou_model
 
-from authentic2.models import DeletedUser
 from authentic2.utils import send_templated_mail
 
 from django.conf import settings
@@ -120,5 +119,5 @@ class Command(BaseCommand):
         ctx = {'user': user}
         with atomic():
             if not self.fake:
-                DeletedUser.objects.delete_user(user)
+                user.mark_as_deleted(timestamp=self.now)
             self.send_mail('authentic2/unused_account_delete', user, ctx)
diff --git src/authentic2/manager/templates/authentic2/manager/user_detail.html src/authentic2/manager/templates/authentic2/manager/user_detail.html
index 1df94dcd..63c052a5 100644
--- src/authentic2/manager/templates/authentic2/manager/user_detail.html
+++ src/authentic2/manager/templates/authentic2/manager/user_detail.html
@@ -41,13 +41,6 @@
 {% endblock %}
 
 {% block other_actions %}
-
-  {% if object.deletion %}
-    <p class="a2-manager-user-deletion">
-      {% blocktrans with date=object.deletion.creation %}Prepared for deletion since {{ date }}{% endblocktrans %}
-    </p>
-  {% endif %}
-
   <p class="a2-manager-user-last-login">
     {% if object.last_login %}
       {% blocktrans with date=object.last_login %}Last login on {{ date }}.{% endblocktrans %}
diff --git src/authentic2/manager/user_views.py src/authentic2/manager/user_views.py
index 64fe239d..838c4253 100644
--- src/authentic2/manager/user_views.py
+++ src/authentic2/manager/user_views.py
@@ -30,7 +30,7 @@ from django.contrib.auth import get_user_model, REDIRECT_FIELD_NAME
 from django.contrib.contenttypes.models import ContentType
 from django.contrib import messages
 from django.views.generic import FormView, TemplateView, DetailView
-from django.http import Http404, FileResponse
+from django.http import Http404, FileResponse, HttpResponseRedirect
 
 import tablib
 
@@ -71,7 +71,7 @@ class UsersView(HideOUColumnMixin, BaseTableView):
 
     def get_queryset(self):
         qs = super(UsersView, self).get_queryset()
-        qs = qs.filter(deletion__isnull=True)
+        qs = qs.filter(deleted__isnull=True)
         qs = qs.select_related('ou')
         qs = qs.prefetch_related('roles', 'roles__parent_relation__parent')
         return qs
@@ -219,6 +219,11 @@ class UserDetailView(OtherActionsMixin, BaseDetailView):
     template_name = 'authentic2/manager/user_detail.html'
     slug_field = 'uuid'
 
+    def get_queryset(self):
+        qs = super(UserDetailView, self).get_queryset()
+        qs = qs.filter(deleted__isnull=True)
+        return qs
+
     @property
     def title(self):
         return self.object.get_full_name()
@@ -630,10 +635,10 @@ class UserDeleteView(BaseDeleteView):
         return reverse('a2-manager-users')
 
     def delete(self, request, *args, **kwargs):
-        response = super(UserDeleteView, self).delete(request, *args, **kwargs)
+        self.get_object().mark_as_deleted()
         hooks.call_hooks('event', name='manager-delete-user', user=request.user,
                          instance=self.object)
-        return response
+        return HttpResponseRedirect(self.get_success_url())
 
 
 user_delete = UserDeleteView.as_view()
diff --git src/authentic2/managers.py src/authentic2/managers.py
index 31a48a59..046026db 100644
--- src/authentic2/managers.py
+++ src/authentic2/managers.py
@@ -44,22 +44,6 @@ class GetByNameQuerySet(QuerySet):
 GetByNameManager = GetByNameQuerySet.as_manager
 
 
-class DeletedUserManager(models.Manager):
-    def delete_user(self, user):
-        user.is_active = False
-        user.save()
-        self.get_or_create(user=user)
-
-    def cleanup(self, threshold=600, timestamp=None):
-        '''Delete all deleted users for more than 10 minutes.'''
-        not_after = (timestamp or now()) - timedelta(seconds=threshold)
-        for deleted_user in self.filter(creation__lte=not_after):
-            user = deleted_user.user
-            deleted_user.delete()
-            user.delete()
-            logger.info(u'deleted account %s', user)
-
-
 class AuthenticationEventManager(models.Manager):
     def cleanup(self):
         # expire after one week
diff --git src/authentic2/migrations/0027_auto_20200421_1609.py src/authentic2/migrations/0027_auto_20200421_1609.py
new file mode 100644
index 00000000..950f2858
--- /dev/null
+++ src/authentic2/migrations/0027_auto_20200421_1609.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-04-21 14:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def noop(apps, schema_editor):
+    pass
+
+
+def fill_deleted(apps, schema_editor):
+    DeletedUser = apps.get_model('authentic2', 'DeletedUser')
+    User = apps.get_model('custom_user', 'User')
+    User.objects.update(
+        deleted=models.Subquery(DeletedUser.objects.filter(user_id=models.OuterRef('id')).values_list('creation')[:1]))
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentic2', '0026_token'),
+        ('custom_user', '0019_user_deleted'),
+    ]
+
+    operations = [
+        migrations.RunPython(fill_deleted, noop),
+        migrations.RemoveField(
+            model_name='deleteduser',
+            name='user',
+        ),
+        migrations.AlterField(
+            model_name='attribute',
+            name='scopes',
+            field=models.CharField(blank=True, default='', help_text='scopes separated by spaces', max_length=256, verbose_name='scopes'),
+        ),
+        migrations.DeleteModel(
+            name='DeletedUser',
+        ),
+    ]
diff --git src/authentic2/models.py src/authentic2/models.py
index de0cbc67..1f15320b 100644
--- src/authentic2/models.py
+++ src/authentic2/models.py
@@ -46,22 +46,6 @@ from . import natural_key as unused_natural_key  # noqa: F401
 from .utils import ServiceAccessDenied
 
 
-class DeletedUser(models.Model):
-    '''Record users to delete'''
-
-    objects = managers.DeletedUserManager()
-
-    user = models.OneToOneField(
-        to=settings.AUTH_USER_MODEL,
-        related_name='deletion',
-        verbose_name=_('user'))
-    creation = models.DateTimeField(auto_now_add=True, verbose_name=_('creation date'))
-
-    class Meta:
-        verbose_name = _('user to delete')
-        verbose_name_plural = _('users to delete')
-
-
 @six.python_2_unicode_compatible
 class UserExternalId(models.Model):
     user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'))
diff --git src/authentic2/views.py src/authentic2/views.py
index 572c5ccb..0f3f905a 100644
--- src/authentic2/views.py
+++ src/authentic2/views.py
@@ -1120,9 +1120,12 @@ class ValidateDeletionView(TemplateView):
             user_pk = deletion_token['user_pk']
             self.user = get_user_model().objects.get(pk=user_pk)
             # A user account wont be deactived twice
+            if self.user.deleted:
+                raise ValidationError(
+                    _('This account has previously been deleted.'))
             if not self.user.is_active:
                 raise ValidationError(
-                    _('This account had previously been deactivated and will be deleted soon.'))
+                    _('This account is inactive, it cannot be deleted.'))
             logger.info('user %s confirmed the deletion of their own account', self.user)
         except signing.SignatureExpired:
             error = _('The account deletion request is too old, try again')
@@ -1140,12 +1143,9 @@ class ValidateDeletionView(TemplateView):
         return utils.redirect(request, 'auth_homepage')
 
     def post(self, request, *args, **kwargs):
-        if 'cancel' not in request.POST:
+        if 'cancel' not in request.POST and not self.user.deleted:
             utils.send_account_deletion_mail(self.request, self.user)
-            models.DeletedUser.objects.delete_user(self.user)
-            self.user.email += '#%d' % random.randint(1, 10000000)
-            self.user.email_verified = False
-            self.user.save(update_fields=['email', 'email_verified'])
+            self.user.mark_as_deleted()
             logger.info(u'deletion of account %s performed', self.user)
             hooks.call_hooks('event', name='delete-account', user=self.user)
             if self.user == request.user:
diff --git tests/test_all.py tests/test_all.py
index 76412be4..2bc7a6c3 100644
--- tests/test_all.py
+++ tests/test_all.py
@@ -90,6 +90,7 @@ class SerializerTests(TestCase):
                     'user_permissions': [],
                     'password': '',
                     'ou': None,
+                    'deleted': None,
                 }
             },
             {
diff --git tests/test_api.py tests/test_api.py
index 57297724..e7b5caa7 100644
--- tests/test_api.py
+++ tests/test_api.py
@@ -417,7 +417,7 @@ def test_api_users_create(settings, app, api_user):
                     'last_name_verified', 'date_joined', 'last_login',
                     'username', 'password', 'email', 'is_active', 'title',
                     'title_verified', 'modified', 'email_verified',
-                    'last_account_deletion_alert']) == set(resp.json.keys())
+                    'last_account_deletion_alert', 'deleted']) == set(resp.json.keys())
         assert resp.json['first_name'] == payload['first_name']
         assert resp.json['last_name'] == payload['last_name']
         assert resp.json['email'] == payload['email']
@@ -484,7 +484,7 @@ def test_api_users_create(settings, app, api_user):
                     'last_name_verified', 'date_joined', 'last_login',
                     'username', 'password', 'email', 'is_active', 'title',
                     'title_verified', 'modified', 'email_verified',
-                    'last_account_deletion_alert']) == set(resp.json.keys())
+                    'last_account_deletion_alert', 'deleted']) == set(resp.json.keys())
         user = get_user_model().objects.get(pk=resp.json['id'])
         assert AttributeValue.objects.with_owner(user).filter(verified=True).count() == 3
         assert AttributeValue.objects.with_owner(user).filter(verified=False).count() == 0
diff --git tests/test_cleanup.py tests/test_cleanup.py
index 933879ec..c83f57b9 100644
--- tests/test_cleanup.py
+++ tests/test_cleanup.py
@@ -16,7 +16,6 @@
 
 import datetime
 
-from authentic2.models import DeletedUser
 from django.contrib.auth import get_user_model
 from django.utils.timezone import now
 
@@ -25,6 +24,6 @@ def test_deleted_user_cleanup(db):
     User = get_user_model()
     u = User.objects.create(username='john.doe')
     assert User.objects.count() == 1
-    DeletedUser.objects.delete_user(u)
-    DeletedUser.objects.cleanup(timestamp=now() + datetime.timedelta(seconds=700))
+    u.mark_as_deleted()
+    User.objects.cleanup(timestamp=now() + datetime.timedelta(seconds=700))
     assert User.objects.count() == 0
diff --git tests/test_commands.py tests/test_commands.py
index 61800d26..efdeb282 100644
--- tests/test_commands.py
+++ tests/test_commands.py
@@ -25,14 +25,13 @@ from django.utils import six
 from django.utils.timezone import now
 import py
 
-from authentic2.models import Attribute, DeletedUser
 from authentic2_auth_oidc.models import OIDCProvider
 from django_rbac.utils import get_ou_model
 
 from utils import login
 
 if six.PY2:
-    FileType = file
+    FileType = file  # noqa: F821
 else:
     from io import TextIOWrapper, BufferedReader, BufferedWriter
     FileType = (TextIOWrapper, BufferedReader, BufferedWriter)
@@ -61,18 +60,21 @@ def test_clean_unused_account(db, simple_user, mailoutbox, freezer):
     simple_user.save()
 
     management.call_command('clean-unused-accounts')
-    assert not DeletedUser.objects.filter(user=simple_user).exists()
+    simple_user.refresh_from_db()
+    assert not simple_user.deleted
     assert len(mailoutbox) == 1
 
     freezer.move_to('2018-01-01 12:00:00')
     # no new mail, no deletion
     management.call_command('clean-unused-accounts')
-    assert not DeletedUser.objects.filter(user=simple_user).exists()
+    simple_user.refresh_from_db()
+    assert not simple_user.deleted
     assert len(mailoutbox) == 1
 
     freezer.move_to('2018-01-02')
     management.call_command('clean-unused-accounts')
-    assert DeletedUser.objects.filter(user=simple_user).exists()
+    simple_user.refresh_from_db()
+    assert simple_user.deleted
     assert len(mailoutbox) == 2
 
 
@@ -92,13 +94,15 @@ def test_clean_unused_account_user_logs_in(app, db, simple_user, mailoutbox, fre
 
     # the day of deletion, nothing happens
     freezer.move_to('2018-01-02')
-    assert not DeletedUser.objects.filter(user=simple_user).exists()
+    simple_user.refresh_from_db()
+    assert not simple_user.deleted
     assert len(mailoutbox) == 1
 
     # when new alert delay is reached, user gets alerted again
     freezer.move_to('2018-01-04')
     management.call_command('clean-unused-accounts')
-    assert not DeletedUser.objects.filter(user=simple_user).exists()
+    simple_user.refresh_from_db()
+    assert not simple_user.deleted
     assert len(mailoutbox) == 2
 
 
@@ -107,7 +111,8 @@ def test_clean_unused_account_disabled_by_default(db, simple_user, mailoutbox):
     simple_user.save()
 
     management.call_command('clean-unused-accounts')
-    assert not DeletedUser.objects.filter(user=simple_user).exists()
+    simple_user.refresh_from_db()
+    assert not simple_user.deleted
     assert len(mailoutbox) == 0
 
 
@@ -121,12 +126,14 @@ def test_clean_unused_account_always_alert(db, simple_user, mailoutbox, freezer)
 
     # even if account last login in past deletion delay, an alert is always sent first
     management.call_command('clean-unused-accounts')
-    assert not len(DeletedUser.objects.filter(user=simple_user))
+    simple_user.refresh_from_db()
+    assert not simple_user.deleted
     assert len(mailoutbox) == 1
 
     # and calling again as no effect, since one day must pass before account is deleted
     management.call_command('clean-unused-accounts')
-    assert not len(DeletedUser.objects.filter(user=simple_user))
+    simple_user.refresh_from_db()
+    assert not simple_user.deleted
     assert len(mailoutbox) == 1
 
 
diff --git tests/test_user_manager.py tests/test_user_manager.py
index 6d42f726..350bcc93 100644
--- tests/test_user_manager.py
+++ tests/test_user_manager.py
@@ -29,7 +29,7 @@ from django.utils.six import text_type
 from django_rbac.utils import get_ou_model
 
 from authentic2.custom_user.models import User
-from authentic2.models import Attribute, AttributeValue, DeletedUser
+from authentic2.models import Attribute, AttributeValue
 from authentic2.a2_rbac.utils import get_default_ou
 from authentic2.manager import user_import
 
@@ -428,12 +428,15 @@ def test_user_import_attributes(transactional_db, app, admin, media):
 
 
 def test_detail_view(app, admin, simple_user):
-    url = '/manage/users/{user.id}/'.format(user=simple_user)
-    response = login(app, admin, url)
-    assert not response.pyquery('.a2-manager-user-deletion')
-    DeletedUser.objects.create(user=simple_user)
-    response = app.get(url)
-    assert response.pyquery('.a2-manager-user-deletion')
+    url = '/manage/users/{user.pk}/'.format(user=simple_user)
+    login(app, admin, url)
+
+
+def test_detail_view_deleted(app, admin, simple_user):
+    url = '/manage/users/{user.pk}/'.format(user=simple_user)
+    login(app, admin, url)
+    simple_user.mark_as_deleted()
+    app.get(url, status=404)
 
 
 def test_user_import_row_error_display(transactional_db, app, admin, media):
diff --git tests/test_views.py tests/test_views.py
index 82c11ffd..7e8b2d46 100644
--- tests/test_views.py
+++ tests/test_views.py
@@ -51,12 +51,16 @@ def test_account_delete(app, simple_user, mailoutbox):
     page = app.get(link)
     # FIXME: webtest does not set the Referer header, so the logout page will always ask for
     # confirmation under tests
-    response = page.form.submit(name='delete').follow()
-    response = response.form.submit()
-    assert not User.objects.get(pk=simple_user.pk).is_active
+    response = page.form.submit(name='delete')
+    assert '_auth_user_id' not in app.session
+    email = simple_user.email
+    simple_user.refresh_from_db()
+    assert not simple_user.is_active
+    assert simple_user.deleted
+    assert simple_user.email != email
     assert len(mailoutbox) == 2
     assert 'Account deletion on testserver' == mailoutbox[1].subject
-    assert [simple_user.email] == mailoutbox[0].to
+    assert mailoutbox[0].to == [email]
     assert urlparse(response.location).path == '/'
     response = response.follow().follow()
     assert response.request.url.endswith('/login/?next=/')
@@ -112,7 +116,7 @@ def test_account_delete_expired_token(app, simple_user, mailoutbox, freezer):
     freezer.move_to('2019-08-01')
     page = login(app, simple_user, path=reverse('delete_account'))
     page.form.submit(name='submit').follow()
-    freezer.move_to('2019-08-04') # Too late...
+    freezer.move_to('2019-08-04')  # Too late...
     link = get_link_from_mail(mailoutbox[0])
     response = app.get(link).follow()
     assert "The account deletion request is too old, try again" in response.text
@@ -133,8 +137,8 @@ def test_account_delete_valid_token_inactive_user(app, simple_user, mailoutbox):
     link = get_link_from_mail(mailoutbox[0])
     simple_user.is_active = False
     simple_user.save()
-    response = app.get(link).follow()
-    assert "This account had previously been deactivated" in response.text
+    response = app.get(link).maybe_follow()
+    assert 'This account is inactive, it cannot be deleted.' in response.text
 
 
 def test_login_invalid_next(app):
-- 
2.26.0