Mise à jour d'avril (#643)

rootplace/management/commands/delete_all_forum_user_messages.py

@@ -40,7 +40,6 @@ class Command(BaseCommand):
         parser.add_argument("user_id", type=int)
 
     def handle(self, *args, **options):
-
         user = User.objects.filter(id=options["user_id"]).first()
 
         if user is None:

rootplace/tests.py

@@ -18,6 +18,7 @@ from datetime import date, timedelta
 from django.core.management import call_command
 from django.test import TestCase
 from django.urls import reverse
+from django.utils.timezone import localtime, now
 
 from club.models import Club
 from core.models import User, RealGroup
@@ -27,22 +28,21 @@ from subscription.models import Subscription
 
 class MergeUserTest(TestCase):
     @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        call_command("populate")
+    def setUpTestData(cls):
         cls.ae = Club.objects.get(unix_name="ae")
         cls.eboutic = Counter.objects.get(name="Eboutic")
         cls.barbar = Product.objects.get(code="BARB")
         cls.barbar.selling_price = 2
         cls.barbar.save()
         cls.root = User.objects.get(username="root")
+        cls.to_keep = User.objects.create(
+            username="to_keep", password="plop", email="u.1@utbm.fr"
+        )
+        cls.to_delete = User.objects.create(
+            username="to_del", password="plop", email="u.2@utbm.fr"
+        )
 
     def setUp(self) -> None:
-        super().setUp()
-        self.to_keep = User(username="to_keep", password="plop", email="u.1@utbm.fr")
-        self.to_delete = User(username="to_del", password="plop", email="u.2@utbm.fr")
-        self.to_keep.save()
-        self.to_delete.save()
         self.client.login(username="root", password="plop")
 
     def test_simple(self):
@@ -144,11 +144,12 @@ class MergeUserTest(TestCase):
         self.assertTrue(self.to_keep.is_subscribed)
         # to_keep had 5 months of subscription remaining and received
         # 5 more months from to_delete, so he should be subscribed for 10 months
-        self.assertEqual(
+        self.assertAlmostEqual(
             today + timedelta(10 * 30),
             self.to_keep.subscriptions.order_by("subscription_end")
             .last()
             .subscription_end,
+            delta=timedelta(1),
         )
 
     def test_godfathers(self):