Merge pull request #4117 from GeotrekCE/fix_test_inconsistency

Fix tests to avoid random errors

geotrek/feedback/management/commands/erase_emails.py

@@ -10,11 +10,11 @@
 
 
 class Command(BaseCommand):
-    help = "Erase emails older than 1 year from feedbacks."
+    help = "Anonymize email addresses from reports older than a given number of days."
 
     def add_arguments(self, parser):
         parser.add_argument('-d', '--days',
-                            help="Erase mails older than DAYS (default: %(default)s)",
+                            help="number of days to keep (default: %(default)s)",
                             type=int,
                             default=365)
         parser.add_argument('--dry-run',
@@ -29,6 +29,6 @@ def handle(self, *args, **options):
 
         if not options['dry_run']:
             updated_reports = older_reports.update(email='')
-            logger.info('{0} email(s) erased'.format(updated_reports))
+            logger.info('{0} email(s) anonymised'.format(updated_reports))
         else:
             logger.info('Dry run mode,{0} report(s) should be modified'.format(older_reports.count(),))

geotrek/feedback/tests/test_commands.py

@@ -5,11 +5,11 @@
 from django.utils import timezone
 
 from geotrek.common.tests import TranslationResetMixin
-from geotrek.feedback.models import PendingEmail, PendingSuricateAPIRequest, Report
+from geotrek.feedback.models import PendingEmail, PendingSuricateAPIRequest
 from geotrek.feedback.tests.factories import ReportFactory
 
 
-class TestRemoveEmailsOlders(TranslationResetMixin, TestCase):
+class TestRemoveEmailsOlder(TranslationResetMixin, TestCase):
     """Test command erase_emails, if older emails are removed"""
     @classmethod
     def setUpTestData(cls):
@@ -24,18 +24,18 @@ def setUp(self):
         self.old_report.save()
 
     def test_erase_old_emails(self):
+        """ Test if email addresses from old reports are removed. """
         output = StringIO()
         call_command('erase_emails', stdout=output)
-        old_report = Report.objects.get(id=self.old_report.id)
-        self.assertEqual(old_report.email, "")
-        self.assertEqual(old_report.__str__(), f"Report {old_report.pk}")
+        self.old_report.refresh_from_db()
+        self.assertEqual(self.old_report.email, "")
 
     def test_dry_run_command(self):
-        """Test if dry_run mode keeps emails"""
+        """Test if dry_run mode keeps email addresses."""
         output = StringIO()
         call_command('erase_emails', dry_run=True, stdout=output)
-        old_report = Report.objects.get(id=self.old_report.id)
-        self.assertEqual(old_report.email, "to_erase@you.com")
+        self.old_report.refresh_from_db()
+        self.assertEqual(self.old_report.email, "to_erase@you.com")
 
 
 class TestFlushPendingRequests(TestCase):

geotrek/feedback/tests/test_suricate_sync.py

@@ -129,7 +129,7 @@ def setUpTestData(cls):
         cls.user = UserFactory()
         UserProfileFactory.create(user=cls.user)
         cls.workflow_manager = WorkflowManagerFactory(user=cls.user)
-        cls.admin = SuperUserFactory(username="Admin", password="drowssap")
+        cls.admin = SuperUserFactory()
         cls.programmed_status = ReportStatusFactory(identifier='programmed', label="Programmé", timer_days=7)
 
     def setUp(self):