exempt 4 in the morning from exclusion because of cleanup task, also …

…refactor all_as_schedule test
celery · Jan 3, 2025 · 09eeff9 · 09eeff9
1 parent 7b6e3a3
commit 09eeff9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/django_celery_beat/schedulers.py b/django_celery_beat/schedulers.py
@@ -410,6 +410,7 @@ def get_excluded_hours_for_crontab_tasks():
             str(current_hour).zfill(2), str(current_hour),
             str(next_hour).zfill(2), str(next_hour),
             str(previous_hour).zfill(2), str(previous_hour),
+            str(4), "04",  # celery's default cleanup task
         }
 
         # Filter out 'should be considered' hours

diff --git a/t/unit/test_schedulers.py b/t/unit/test_schedulers.py
@@ -455,12 +455,13 @@ def setup_scheduler(self, app):
             solar('solar_noon', 48.06, 12.86))
         self.m4.save()
         self.m4.refresh_from_db()
-
-        dt_aware = make_aware(datetime(day=26,
-                                       month=7,
-                                       year=3000,
-                                       hour=1,
-                                       minute=0))  # future time
+        now = datetime.now()
+        two_minutes_later = now + timedelta(minutes=2)
+        dt_aware = make_aware(datetime(day=two_minutes_later.day,
+                                       month=two_minutes_later.month,
+                                       year=two_minutes_later.year,
+                                       hour=two_minutes_later.hour,
+                                       minute=two_minutes_later.minute))  # future time
         self.m6 = self.create_model_clocked(
             clocked(dt_aware)
         )